Repository: cayenne Updated Branches: refs/heads/master 55ea394a6 -> 09b93d0ce
cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/09b93d0c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/09b93d0c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/09b93d0c Branch: refs/heads/master Commit: 09b93d0ce32c5ad9b6c1f1282d4b23da7bc5eea2 Parents: 55ea394 Author: aadamchik <aadamc...@apache.org> Authored: Sun May 10 14:34:43 2015 -0400 Committer: aadamchik <aadamc...@apache.org> Committed: Sun May 10 14:34:43 2015 -0400 ---------------------------------------------------------------------- .../select/DefaultSelectTranslator.java | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/09b93d0c/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java index 38b5763..5e67b21 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java @@ -79,18 +79,6 @@ public class DefaultSelectTranslator extends QueryAssembler implements SelectTra } JoinStack joinStack; - - public DefaultSelectTranslator(Query query, DbAdapter adapter, EntityResolver entityResolver) { - super(query, adapter, entityResolver); - } - - protected JoinStack getJoinStack() { - if (joinStack == null) { - joinStack = createJoinStack(); - } - return joinStack; - } - List<ColumnDescriptor> resultColumns; Map<ObjAttribute, ColumnDescriptor> attributeOverrides; Map<ColumnDescriptor, ObjAttribute> defaultAttributesByColumn; @@ -104,6 +92,17 @@ public class DefaultSelectTranslator extends QueryAssembler implements SelectTra */ boolean forcingDistinct; + public DefaultSelectTranslator(Query query, DbAdapter adapter, EntityResolver entityResolver) { + super(query, adapter, entityResolver); + } + + protected JoinStack getJoinStack() { + if (joinStack == null) { + joinStack = createJoinStack(); + } + return joinStack; + } + protected JoinStack createJoinStack() { return new JoinStack(getAdapter(), queryMetadata.getDataMap(), this); }
