Add flattened relationship support for many to many in ERXExistsQuali…

…fier. Fix date typos in comments.
wocommunity · May 20, 2016 · 60152b3 · 60152b3
1 parent 41229d4
commit 60152b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKey.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXKey.java
@@ -2374,7 +2374,7 @@ public ERXKeyValueQualifier containsObject(Object obj) {
 	 *         represented by this ERXKey.
 	 * 
 	 * @author Samuel Pelletier
-	 * @since May 56, 2016
+	 * @since May 16, 2016
 	 */
 	public ERXExistsQualifier containsAnyOfTheseObjects(NSArray<? extends ERXGenericRecord> valueArray) {
 		ERXExistsQualifier existsQualifier = new ERXExistsQualifier(ERXQ.isIn(valueArray), _key);

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQ.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXQ.java
@@ -373,7 +373,7 @@ public static <T> ERXKeyComparisonQualifier equals(ERXKey<T> key, ERXKey<T> valu
 	 * @return an EOQualifier 
 	 * 
 	 * @author Samuel Pelletier
-	 * @since May 56, 2016
+	 * @since May 16, 2016
 	 */
 	public static EOQualifier isIn(NSArray<? extends ERXGenericRecord> valueArray) {
 		NSMutableArray<EOQualifier> qualifiers = new NSMutableArray<>();
@@ -391,7 +391,7 @@ public static EOQualifier isIn(NSArray<? extends ERXGenericRecord> valueArray) {
 	 * @return an EOQualifier 
 	 * 
 	 * @author Samuel Pelletier
-	 * @since May 56, 2016
+	 * @since May 16, 2016
 	 */
 	public static EOQualifier is(ERXGenericRecord value) {
 		EOEntity entity = value.entity();

diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/qualifiers/ERXExistsQualifier.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/qualifiers/ERXExistsQualifier.java
@@ -41,8 +41,10 @@
 import com.webobjects.foundation.NSMutableArray;
 import com.webobjects.foundation.NSMutableSet;
 
+import er.extensions.eof.ERXKey;
 import er.extensions.foundation.ERXArrayUtilities;
 import er.extensions.foundation.ERXStringUtilities;
+import er.extensions.qualifiers.ERXPrefixQualifierTraversal;
 
 /**
  * A qualifier that qualifies using an EXISTS clause.
@@ -51,7 +53,7 @@
  *
  * <code>select t0.ID, t0.ATT_1, ... t0.ATT_N from FIRST_TABLE t0 where EXISTS (select t1.ID from ANOTHER_TABLE where t1.ATT_1 = ? and t1.FIRST_TABLE_ID = t0.ID)</code>
  *
- * @author Travis Cripps, Aaron Rosenzweig
+ * @author Travis Cripps, Aaron Rosenzweig, Samuel Pelletier
  */
 public class ERXExistsQualifier extends EOQualifier implements Cloneable, NSCoding, EOKeyValueArchiving {
 	/**
@@ -229,6 +231,23 @@ public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression e
                     }
                 }
             }
+
+            // If this is a flattened relationship, we need to insert the middle hidden entity and adjust key paths
+            if (relationship != null && relationship.definition() != null) {
+            	if (relationship.componentRelationships().count() != 2) {
+            		throw new IllegalArgumentException("ERXExistsQualifier only support many to many flattened relationship.");
+            	}
+            	EORelationship innerToManyRelationship = (EORelationship) relationship.componentRelationships().objectAtIndex(0);
+            	EORelationship innerToOneRelationship = (EORelationship) relationship.componentRelationships().objectAtIndex(1);
+
+            	if (baseKeyPath != null) {
+            		baseKeyPath = baseKeyPath.replaceAll(relationship.name()+"$", innerToManyRelationship.relationshipPath());
+            	}
+            	relationship = innerToManyRelationship;
+
+            	ERXKey<Object> prefixKey = new ERXKey<>(innerToOneRelationship.relationshipPath());
+            	subqualifier = prefixKey.prefix(subqualifier);
+            }
 
             EOEntity srcEntity = relationship != null ? relationship.entity() : baseEntity;
             EOEntity destEntity = relationship != null ? relationship.destinationEntity() : baseEntity;
@@ -276,7 +295,7 @@ public String sqlStringForSQLExpression(EOQualifier qualifier, EOSQLExpression e
 
             EOSQLExpression subExpression = factory.expressionForEntity(destEntity);
             subExpression.setUseAliases(true);
-            subExpression.prepareSelectExpressionWithAttributes(destEntity.primaryKeyAttributes(), false, fetchSpecification);
+            subExpression.prepareSelectExpressionWithAttributes(relationship.destinationAttributes(), false, fetchSpecification);
 
             for (Enumeration bindEnumeration = subExpression.bindVariableDictionaries().objectEnumerator(); bindEnumeration.hasMoreElements();) {
                 expression.addBindVariableDictionary((NSDictionary)bindEnumeration.nextElement());