Merge branch 'hotfix-10.8.68' into stable

pixl8 · Jan 18, 2018 · f6c0df6 · f6c0df6
2 parents 4c7c88f + 20c6717
commit f6c0df6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/system/handlers/rules/dynamic/presideObjectExpressions/OneToManyHas.cfc b/system/handlers/rules/dynamic/presideObjectExpressions/OneToManyHas.cfc
@@ -61,17 +61,17 @@ component {
 			, getSqlAndParamsOnly = true
 		);
 		var subQueryParams = {};
-		var subQueryAlias = "manyToManyCount" & CreateUUId().lCase().replace( "-", "", "all" );
-		var filterSql     = "#subQueryAlias#.onetomany_count ${operator} 0";
+		var subQueryAlias = "oneToManyHas" & CreateUUId().lCase().replace( "-", "", "all" );
+		var filterSql     = "";
 
 		for( var param in subQuery.params ) {
 			subQueryParams[ param.name ] = param;
 		}
 
 		if ( _is ) {
-			filterSql = filterSql.replace( "${operator}", ">" );
+			filterSql = "#subQueryAlias#.onetomany_count > 0";
 		} else {
-			filterSql = filterSql.replace( "${operator}", "=" );
+			filterSql = "( #subQueryAlias#.onetomany_count is null or #subQueryAlias#.onetomany_count = 0 )";
 		}
 
 		var prefix = filterPrefix.len() ? filterPrefix : ( parentPropertyName.len() ? parentPropertyName : objectName );