Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Csaba Varga 2012-11-21 14:30:07 +01:00 committed by Lukasz Antoniak
parent cd3363151b
commit dadc43af23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-envers/src/main/java/org/hibernate/envers/query/criteria/AggregatedAuditExpression.java
View File

@ -59,13 +59,15 @@ public class AggregatedAuditExpression implements AuditCriterion, ExtendableCrit
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 class AggregatedAuditExpression implements AuditCriterion, ExtendableCrit
}
// Adding the constrain on the result of the aggregated criteria
parameters.addWhere(propertyName, "=", subQb);
subParams.addWhere(propertyName, "=", subQb);
}
}