fix for GRAILS-10232 "GORM CountBy does not work anymore with sorted mapping"

Author: graemerocher

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/cfg/GrailsHibernateUtil.java

@@ -154,6 +154,10 @@ private static void configureDomainClass(SessionFactory sessionFactory, String s
         }
     }
 
+    public static void populateArgumentsForCriteria(GrailsApplication grailsApplication, Class<?> targetClass, Criteria c, Map argMap) {
+        populateArgumentsForCriteria(grailsApplication, targetClass, c, argMap, true);
+    }
+
     /**
      * Populates criteria arguments for the given target class and arguments map
      *
@@ -163,7 +167,7 @@ private static void configureDomainClass(SessionFactory sessionFactory, String s
      * @param argMap The arguments map
      */
     @SuppressWarnings("rawtypes")
-    public static void populateArgumentsForCriteria(GrailsApplication grailsApplication, Class<?> targetClass, Criteria c, Map argMap) {
+    public static void populateArgumentsForCriteria(GrailsApplication grailsApplication, Class<?> targetClass, Criteria c, Map argMap, boolean includeDefaultMapping) {
         Integer maxParam = null;
         Integer offsetParam = null;
         SimpleTypeConverter converter = new SimpleTypeConverter();
@@ -224,7 +228,7 @@ public static void populateArgumentsForCriteria(GrailsApplication grailsApplicat
             }
             addOrderPossiblyNested(grailsApplication,c, targetClass, sort, order, ignoreCase);
         }
-        else {
+        else if(includeDefaultMapping){
             Mapping m = GrailsDomainBinder.getMapping(targetClass);
             if (m != null && !StringUtils.isBlank(m.getSort())) {
                 addOrderPossiblyNested(grailsApplication, c, targetClass, m.getSort(), m.getOrder(), true);

grails-hibernate/src/main/groovy/org/codehaus/groovy/grails/orm/hibernate/metaclass/CountByPersistentMethod.java

@@ -68,7 +68,7 @@ public Object doInHibernate(Session session) throws HibernateException, SQLExcep
                 final Criteria crit = getCriteria(datastore, application, session, detachedCriteria, additionalCriteria, clazz);
                 crit.setProjection(Projections.rowCount());
                 Map argsMap = (arguments.length > 1 && (arguments[1] instanceof Map)) ? (Map) arguments[1] : Collections.EMPTY_MAP;
-                GrailsHibernateUtil.populateArgumentsForCriteria(application, clazz, crit, argsMap);
+                GrailsHibernateUtil.populateArgumentsForCriteria(application, clazz, crit, argsMap, false);
                 populateCriteriaWithExpressions(crit, operator, expressions);
                 return crit.uniqueResult();
             }

grails-test-suite-persistence/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CountByWithDefaultSortOrderSpec.groovy

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.codehaus.groovy.grails.orm.hibernate
+
+import grails.persistence.Entity
+import spock.lang.Issue
+
+/**
+ */
+class CountByWithDefaultSortOrderSpec extends GormSpec{
+
+    @Issue('GRAILS-10232')
+    void "Test that countBy works when there is a default sort order defined" () {
+        when:"A countBy query is executed"
+            int count = CountByWithDefaultSortOrder.countByActivate(true)
+        then:"No exception is thrown and the result is correct"
+            count == 0
+    }
+    @Override
+    List getDomainClasses() {
+       [CountByWithDefaultSortOrder]
+    }
+}
+
+@Entity
+class CountByWithDefaultSortOrder {
+
+    int sortIndex;
+    String code;
+    boolean activate = true;
+
+    static mapping = {
+        id generator: 'increment'
+        code unique: true
+        sort 'sortIndex'
+    }
+
+    static constraints = {
+        code nullable: false, blank: false, minSize: 1, unique: true
+        sortIndex nullable: false
+    }
+}