garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

rollback inner join changes, left joins actually enforce order

Browse Source
This commit is contained in:
Athou
2013-05-16 17:01:10 +02:00
parent afb10394f3
commit 4ec2cc51ca
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -10,6 +10,7 @@ import javax.persistence.Query;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join; import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Path; import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
@@ -67,13 +68,13 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList(); List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
.fetch(FeedEntryStatus_.entry); .fetch(FeedEntryStatus_.entry, JoinType.LEFT);
Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
.fetch(FeedEntryStatus_.subscription); .fetch(FeedEntryStatus_.subscription, JoinType.LEFT);
subJoin.fetch(FeedSubscription_.feed); subJoin.fetch(FeedSubscription_.feed, JoinType.LEFT);
Join<FeedEntry, FeedEntryContent> contentJoin = (Join<FeedEntry, FeedEntryContent>) entryJoin Join<FeedEntry, FeedEntryContent> contentJoin = (Join<FeedEntry, FeedEntryContent>) entryJoin
.fetch(FeedEntry_.content); .fetch(FeedEntry_.content, JoinType.LEFT);
predicates predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user)); .add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -105,18 +106,18 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList(); List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
.fetch(FeedEntryStatus_.entry); .fetch(FeedEntryStatus_.entry, JoinType.LEFT);
Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
.fetch(FeedEntryStatus_.subscription); .fetch(FeedEntryStatus_.subscription, JoinType.LEFT);
subJoin.fetch(FeedSubscription_.feed); subJoin.fetch(FeedSubscription_.feed, JoinType.LEFT);
predicates predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user)); .add(builder.equal(subJoin.get(FeedSubscription_.user), user));
predicates.add(builder.equal(root.get(FeedEntryStatus_.starred), true)); predicates.add(builder.equal(root.get(FeedEntryStatus_.starred), true));
query.where(predicates.toArray(new Predicate[0])); query.where(predicates.toArray(new Predicate[0]));
if (includeContent) { if (includeContent) {
entryJoin.fetch(FeedEntry_.content); entryJoin.fetch(FeedEntry_.content, JoinType.LEFT);
} }
orderBy(query, entryJoin, order); orderBy(query, entryJoin, order);
@@ -140,10 +141,10 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList(); List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
.fetch(FeedEntryStatus_.entry); .fetch(FeedEntryStatus_.entry, JoinType.LEFT);
Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
.fetch(FeedEntryStatus_.subscription); .fetch(FeedEntryStatus_.subscription, JoinType.LEFT);
subJoin.fetch(FeedSubscription_.feed); subJoin.fetch(FeedSubscription_.feed, JoinType.LEFT);
predicates predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user)); .add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -152,7 +153,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
} }
if (includeContent) { if (includeContent) {
entryJoin.fetch(FeedEntry_.content); entryJoin.fetch(FeedEntry_.content, JoinType.LEFT);
} }
query.where(predicates.toArray(new Predicate[0])); query.where(predicates.toArray(new Predicate[0]));
@@ -195,10 +196,10 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList(); List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
.fetch(FeedEntryStatus_.entry); .fetch(FeedEntryStatus_.entry, JoinType.LEFT);
Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
.fetch(FeedEntryStatus_.subscription); .fetch(FeedEntryStatus_.subscription, JoinType.LEFT);
subJoin.fetch(FeedSubscription_.feed); subJoin.fetch(FeedSubscription_.feed, JoinType.LEFT);
predicates predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user)); .add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -209,7 +210,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
} }
if (includeContent) { if (includeContent) {
entryJoin.fetch(FeedEntry_.content); entryJoin.fetch(FeedEntry_.content, JoinType.LEFT);
} }
query.where(predicates.toArray(new Predicate[0])); query.where(predicates.toArray(new Predicate[0]));
@@ -239,10 +240,10 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
List<Predicate> predicates = Lists.newArrayList(); List<Predicate> predicates = Lists.newArrayList();
Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root Join<FeedEntryStatus, FeedEntry> entryJoin = (Join<FeedEntryStatus, FeedEntry>) root
.fetch(FeedEntryStatus_.entry); .fetch(FeedEntryStatus_.entry, JoinType.LEFT);
Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root Join<FeedEntryStatus, FeedSubscription> subJoin = (Join<FeedEntryStatus, FeedSubscription>) root
.fetch(FeedEntryStatus_.subscription); .fetch(FeedEntryStatus_.subscription, JoinType.LEFT);
subJoin.fetch(FeedSubscription_.feed); subJoin.fetch(FeedSubscription_.feed, JoinType.LEFT);
predicates predicates
.add(builder.equal(subJoin.get(FeedSubscription_.user), user)); .add(builder.equal(subJoin.get(FeedSubscription_.user), user));
@@ -252,7 +253,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
} }
if (includeContent) { if (includeContent) {
entryJoin.fetch(FeedEntry_.content); entryJoin.fetch(FeedEntry_.content, JoinType.LEFT);
} }
query.where(predicates.toArray(new Predicate[0])); query.where(predicates.toArray(new Predicate[0]));