You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2010/01/14 17:48:29 UTC
svn commit: r899291 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc:
EJBQLConditionTranslator.java EJBQLJoinAppender.java EJBQLPathTranslator.java
Author: aadamchik
Date: Thu Jan 14 16:48:29 2010
New Revision: 899291
URL: http://svn.apache.org/viewvc?rev=899291&view=rev
Log:
CAY-1069 EJBQL: support paths across flattened relationships
stripping obsolete TODO notes
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java?rev=899291&r1=899290&r2=899291&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLConditionTranslator.java Thu Jan 14 16:48:29 2010
@@ -196,8 +196,6 @@
}
context.append(" WHERE");
- // TODO: andrus, 8/11/2007 flattened?
- // 11/01/2010 flattened relationship are processing earlier
DbRelationship correlatedJoinRelationship = context.getIncomingRelationships(
new EJBQLTableId(id)).get(0);
Iterator<DbJoin> it = correlatedJoinRelationship.getJoins().iterator();
@@ -291,8 +289,6 @@
context.append(" WHERE");
- // TODO: andrus, 8/11/2007 flattened?
- // 11/01/2010 flattened relationship are processing earlier
DbRelationship correlatedJoinRelationship = context.getIncomingRelationships(
new EJBQLTableId(id)).get(0);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java?rev=899291&r1=899290&r2=899291&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLJoinAppender.java Thu Jan 14 16:48:29 2010
@@ -102,8 +102,6 @@
throw new EJBQLException("No join configured for id " + rhsId);
}
- // TODO: andrus, 4/8/2007 - support for flattened relationships
- // 11/01/2010 support for flattened relationships is represented below
DbRelationship incomingDB = joinRelationships.get(0);
// TODO: andrus, 1/6/2008 - move reusable join check here...
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java?rev=899291&r1=899290&r2=899291&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/EJBQLPathTranslator.java Thu Jan 14 16:48:29 2010
@@ -229,8 +229,6 @@
// use an outer join for to-many matches
resolveJoin(false);
- // TODO: andrus, 6/21/2007 - flattened support
- // 11/01/2010 flattened support added in chooseDbRelationship
DbRelationship dbRelationship = chooseDbRelationship(relationship);
DbEntity table = (DbEntity) dbRelationship.getTargetEntity();
@@ -258,8 +256,6 @@
else {
// match FK against the target object
- // TODO: andrus, 6/21/2007 - flattened support
- // 11/01/2010 flattened support added in chooseDbRelationship
DbRelationship dbRelationship = chooseDbRelationship(relationship);
DbEntity table = (DbEntity) dbRelationship.getSourceEntity();