HHH-7800: Fixed "maximize" doesn't work inside a disjunction issue

csaboka · lukasz-antoniak · commit dadc43af23b1 · 2012-11-22T12:02:31.000+01:00
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java b/hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
@@ -59,13 +59,15 @@ public void addToQuery(AuditConfiguration auditCfg, String entityName, QueryBuil
 
         CriteriaTools.checkPropertyNotARelation(auditCfg, entityName, propertyName);
 
+        // Make sure our conditions are ANDed together even if the parent Parameters have a different connective
+        Parameters subParams = parameters.addSubParameters(Parameters.AND);
         // This will be the aggregated query, containing all the specified conditions
         QueryBuilder subQb = qb.newSubQueryBuilder();
 
         // Adding all specified conditions both to the main query, as well as to the
         // aggregated one.
         for (AuditCriterion versionsCriteria : criterions) {
-            versionsCriteria.addToQuery(auditCfg, entityName, qb, parameters);
+            versionsCriteria.addToQuery(auditCfg, entityName, qb, subParams);
             versionsCriteria.addToQuery(auditCfg, entityName, subQb, subQb.getRootParameters());
         }
 
@@ -79,6 +81,6 @@ public void addToQuery(AuditConfiguration auditCfg, String entityName, QueryBuil
         }
 
         // Adding the constrain on the result of the aggregated criteria
-        parameters.addWhere(propertyName, "=", subQb);
+        subParams.addWhere(propertyName, "=", subQb);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -59,13 +59,15 @@ public void addToQuery(AuditConfiguration auditCfg, String entityName, QueryBuil`
`59`	`59`
`60`	`60`	`CriteriaTools.checkPropertyNotARelation(auditCfg, entityName, propertyName);`
`61`	`61`
	`62`	`+ // Make sure our conditions are ANDed together even if the parent Parameters have a different connective`
	`63`	`+ Parameters subParams = parameters.addSubParameters(Parameters.AND);`
`62`	`64`	`// This will be the aggregated query, containing all the specified conditions`
`63`	`65`	`QueryBuilder subQb = qb.newSubQueryBuilder();`
`64`	`66`
`65`	`67`	`// Adding all specified conditions both to the main query, as well as to the`
`66`	`68`	`// aggregated one.`
`67`	`69`	`for (AuditCriterion versionsCriteria : criterions) {`
`68`		`- versionsCriteria.addToQuery(auditCfg, entityName, qb, parameters);`
	`70`	`+ versionsCriteria.addToQuery(auditCfg, entityName, qb, subParams);`
`69`	`71`	`versionsCriteria.addToQuery(auditCfg, entityName, subQb, subQb.getRootParameters());`
`70`	`72`	`}`
`71`	`73`
`@@ -79,6 +81,6 @@ public void addToQuery(AuditConfiguration auditCfg, String entityName, QueryBuil`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`// Adding the constrain on the result of the aggregated criteria`
`82`		`- parameters.addWhere(propertyName, "=", subQb);`
	`84`	`+ subParams.addWhere(propertyName, "=", subQb);`
`83`	`85`	`}`
`84`	`86`	`}`