fix for failing tests (rolled back 4199)

Author: graemerocher

src/persistence/grails/orm/HibernateCriteriaBuilder.java

@@ -115,23 +115,21 @@ public class HibernateCriteriaBuilder extends GroovyObjectSupport {
     private MetaClass criteriaMetaClass;
 
     private boolean uniqueResult = false;
-    private List<LogicalExpression> logicalExpressionStack = new ArrayList<LogicalExpression>();
-    private List<String> associationStack = new ArrayList<String>();
+    private Stack logicalExpressionStack = new Stack();
+    private Stack associationStack = new Stack();
     private boolean participate;
     private boolean scroll;
     private boolean count;
     private ProjectionList projectionList;
     private BeanWrapper targetBean;
     private List<String> aliasStack = new ArrayList<String>();
-    private List<Criteria> aliasInstanceStack = new ArrayList<Criteria>();
-
     private Map<String, String> aliasMap = new HashMap<String, String>();
     private static final String ALIAS = "_alias";
     private ResultTransformer resultTransformer;
     private int aliasCount;
-    private boolean paginationEnabledList = false;
-    private ArrayList<Order> orderEntries;	
 
+	private boolean paginationEnabledList = false;
+	private ArrayList<Order> orderEntries;	
 
     public HibernateCriteriaBuilder(Class targetClass, SessionFactory sessionFactory) {
         super();
@@ -694,9 +692,8 @@ public Object order(String propertyName) {
 		if (this.paginationEnabledList) {
 			orderEntries.add(o);
 		} else {
-    		this.criteria.addOrder(o);
+			this.criteria.addOrder(o);
 		}
-
         return o;
     }
 
@@ -724,7 +721,6 @@ public Object order(String propertyName, String direction) {
 		} else {
 			this.criteria.addOrder(o);
 		}
-
         return o;
     }
     /**
@@ -890,14 +886,12 @@ else if (name.equals(LIST_DISTINCT_CALL)) {
                 this.resultTransformer = CriteriaSpecification.DISTINCT_ROOT_ENTITY;
             }
 
-
             createCriteriaInstance();
 
             // Check for pagination params
             if(name.equals(LIST_CALL) && args.length == 2) {
-                paginationEnabledList = true;
-                orderEntries = new ArrayList<Order>();
-
+            	paginationEnabledList = true;
+				orderEntries = new ArrayList<Order>();
                 invokeClosureNode(args[1]);
             } else {
                 invokeClosureNode(args[0]);
@@ -930,7 +924,7 @@ else if(count) {
                     this.criteria.setProjection(null);
 					for(Iterator<Order> it = orderEntries.iterator();it.hasNext();){
 						this.criteria.addOrder(it.next());
-					}                    
+					}
                     this.criteria.setResultTransformer(CriteriaSpecification.ROOT_ENTITY);
                     GrailsHibernateUtil.populateArgumentsForCriteria(targetClass, this.criteria, (Map)args[0]);
                     PagedResultList pagedRes = new PagedResultList(this.criteria.list());
@@ -979,7 +973,7 @@ else if(args.length == 1 && args[0] instanceof Closure) {
                     this.logicalExpressionStack.add(new LogicalExpression(name));
                     invokeClosureNode(args[0]);
 
-                    LogicalExpression logicalExpression = logicalExpressionStack.get(logicalExpressionStack.size()-1);
+                    LogicalExpression logicalExpression = (LogicalExpression) logicalExpressionStack.pop();
                     addToCriteria(logicalExpression.toCriterion());
 
                     return name;
@@ -1007,21 +1001,18 @@ else if(targetBean.isReadableProperty(name.toString())) {
                         targetClass = sessionFactory.getClassMetadata(otherSideEntityName).getMappedClass(EntityMode.POJO);
                         BeanWrapper oldTargetBean = targetBean;
                         targetBean = new BeanWrapperImpl(BeanUtils.instantiateClass(targetClass));
-                        associationStack.add(name.toString());
+                        associationStack.push(name.toString());
                         final String associationPath = getAssociationPath();
                         createAliasIfNeccessary(name, associationPath);
                         // the criteria within an association node are grouped with an implicit AND
-                        logicalExpressionStack.add(new LogicalExpression(AND));
+                        logicalExpressionStack.push(new LogicalExpression(AND));
                         invokeClosureNode(args[0]);
                         aliasStack.remove(aliasStack.size() - 1);
-                        if(!aliasInstanceStack.isEmpty()) {
-                            aliasInstanceStack.remove(aliasInstanceStack.size() - 1);
-                        }
-                        LogicalExpression logicalExpression = (LogicalExpression) logicalExpressionStack.remove(logicalExpressionStack.size()-1);
+                        LogicalExpression logicalExpression = (LogicalExpression) logicalExpressionStack.pop();
                         if (!logicalExpression.args.isEmpty()) {
                             addToCriteria(logicalExpression.toCriterion());
                         }
-                        associationStack.remove(associationStack.size()-1);
+                        associationStack.pop();
                         targetClass = oldTargetClass;
                         targetBean = oldTargetBean;
                         return name;
@@ -1035,7 +1026,7 @@ else if(args.length == 1 && args[0] != null) {
                 Object value = args[0];
                 Criterion c = null;
                 if(name.equals(ID_EQUALS)) {
-                    return eq("id", value);
+                    c = Restrictions.idEq(value);
                 }
                 else {
 
@@ -1072,16 +1063,6 @@ else if(name.equals( IS_NOT_EMPTY )) {
         throw new MissingMethodException(name, getClass(), args) ;
     }
 
-    private void addToCurrentOrAliasedCriteria(Criterion criterion) {
-        if(!aliasInstanceStack.isEmpty()) {
-            Criteria c = aliasInstanceStack.get(aliasInstanceStack.size()-1);
-            c.add(criterion);
-        }
-        else {
-            this.criteria.add(criterion);
-        }
-    }
-
 
     private void createAliasIfNeccessary(String associationName, String associationPath) {
         String newAlias;
@@ -1092,7 +1073,7 @@ private void createAliasIfNeccessary(String associationName, String associationP
             aliasCount++;
             newAlias = associationName + ALIAS + aliasCount;
             aliasMap.put(associationPath, newAlias);
-            this.aliasInstanceStack.add(this.criteria.createAlias(associationPath, newAlias, CriteriaSpecification.LEFT_JOIN));
+            this.criteria.createAlias(associationPath, newAlias, CriteriaSpecification.LEFT_JOIN);
         }
         this.aliasStack.add(newAlias);
     }
@@ -1166,7 +1147,7 @@ private void closeSessionFollowingException() {
      */
     private Criterion addToCriteria(Criterion c) {
         if (!logicalExpressionStack.isEmpty()) {
-            logicalExpressionStack.get(logicalExpressionStack.size()-1).args.add(c);
+            ((LogicalExpression) logicalExpressionStack.peek()).args.add(c);
         }
         else {
             this.criteria.add(c);

test/groovy/org/codehaus/groovy/grails/orm/hibernate/CriteriaBuilderTests.groovy

@@ -42,43 +42,6 @@ class CriteriaBuilderAuthor {
     }
 
 
-    void testIdEq() {
-        def authorClass = ga.getDomainClass("CriteriaBuilderAuthor").clazz
-        def bookClass = ga.getDomainClass("CriteriaBuilderBook").clazz
-
-        assert authorClass.newInstance(name:"Stephen King")
-                                    .addToBooks(title:"The Shining")
-                                    .addToBooks(title:"The Stand")
-                                    .addToBooks(title:"Rose Madder")
-                                    .save(flush:true)
-
-        assert authorClass.newInstance(name:"James Patterson")
-                                    .addToBooks(title:"Along Came a Spider")
-                                    .addToBooks(title:"A Time to Kill")
-                                    .addToBooks(title:"Killing Me Softly")
-                                    .addToBooks(title:"The Quickie")
-                                    .save(flush:true)
-
-
-        
-
-        session.clear()
-        def book = bookClass.findByTitle("The Quickie")
-
-        assertNotNull "should have found book", book
-
-        def authors = authorClass.withCriteria {
-            books {
-                idEq book.id
-            }
-        }
-
-        assertNotNull "should have returned a list of authors", authors
-
-        assertEquals 1, authors.size()
-        assertEquals "James Patterson", authors[0].name
-    }
-
     void testSizeCriterion() {
         def authorClass = ga.getDomainClass("CriteriaBuilderAuthor").clazz