fix(HasOne): Provide initialThroughConstraints for hasOne relationships

coldbox-modules · Oct 30, 2020 · 7b3b8d0 · 7b3b8d0
1 parent 1ee78eb
commit 7b3b8d0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/models/Relationships/HasMany.cfc b/models/Relationships/HasMany.cfc
@@ -60,29 +60,4 @@ component extends="quick.models.Relationships.HasOneOrMany" accessors="true" {
 		return matchMany( argumentCollection = arguments );
 	}
 
-	/**
-	 * Applies the constraints for the final relationship in a `hasManyThrough` chain.
-	 *
-	 * @return  void
-	 */
-	public QueryBuilder function initialThroughConstraints() {
-		return variables.related
-			.newQuery()
-			.reselectRaw( 1 )
-			.where( function( q ) {
-				arrayZipEach(
-					[
-						variables.foreignKeys,
-						variables.localKeys
-					],
-					function( foreignKey, localKey ) {
-						q.where(
-							variables.related.qualifyColumn( foreignKey ),
-							variables.parent.retrieveAttribute( localKey )
-						);
-					}
-				);
-			} );
-	}
-
 }
diff --git a/models/Relationships/HasOneOrMany.cfc b/models/Relationships/HasOneOrMany.cfc
@@ -406,4 +406,29 @@ component extends="quick.models.Relationships.BaseRelationship" accessors="true"
 		} );
 	}
 
+	/**
+	 * Applies the constraints for the final relationship in a `hasManyThrough` chain.
+	 *
+	 * @return  void
+	 */
+	public QueryBuilder function initialThroughConstraints() {
+		return variables.related
+			.newQuery()
+			.reselectRaw( 1 )
+			.where( function( q ) {
+				arrayZipEach(
+					[
+						variables.foreignKeys,
+						variables.localKeys
+					],
+					function( foreignKey, localKey ) {
+						q.where(
+							variables.related.qualifyColumn( foreignKey ),
+							variables.parent.retrieveAttribute( localKey )
+						);
+					}
+				);
+			} );
+	}
+
 }