CAY-2836 ObjectSelect.selectCount() throws if a query contains ordering

Author: stariy95

RELEASE-NOTES.txt

@@ -19,6 +19,7 @@ CAY-2897 Add no-op default implementations to the GraphChangeHandler interface
 
 Bug Fixes:
 
+CAY-2836 ObjectSelect.selectCount() throws if a query contains ordering
 CAY-2883 License and notice templates are not processed by the Gradle build
 CAY-2885 Modeler: DbImport fails to load DB schema view
 CAY-2887 Expressions: Incorrect serialization to string of numeric literals

cayenne-server/src/main/java/org/apache/cayenne/query/ObjectSelect.java

@@ -678,7 +678,10 @@ public ObjectSelect<T> distinct() {
      * @return count of rows
      */
     public long selectCount(ObjectContext context) {
-        return count().selectOne(context);
+        ColumnSelect<Long> count = count();
+        // reset orderings, see CAY-2836
+        count.orderings = Collections.emptyList();
+        return count.selectOne(context);
     }
 
     @Override

cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_RunIT.java

@@ -236,4 +236,12 @@ public void test_CAY_2092() {
 			assertNotNull(artist);
 		}
 	}
+
+	@Test
+	public void test_CAY_2836_countWithOrdering() {
+		long count = ObjectSelect.query(Artist.class)
+				.orderBy(Artist.ARTIST_NAME.asc())
+				.selectCount(context);
+		assertEquals(20, count);
+	}
 }