[cayenne] 01/02: CAY-2810 Can't use custom operator expression with aggregate functions

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 24b397fd9852cea32ed28ac10b4e8595295434e0
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Jul 6 18:17:31 2023 +0300

    CAY-2810 Can't use custom operator expression with aggregate functions
---
 .../java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
 
b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
index 54a544496..efeecc4df 100644
--- 
a/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
+++ 
b/cayenne-server/src/test/java/org/apache/cayenne/query/ObjectSelect_AggregateIT.java
@@ -35,6 +35,7 @@ import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
 import org.apache.cayenne.testdo.testmap.Artist;
 import org.apache.cayenne.testdo.testmap.Painting;
+import org.apache.cayenne.unit.UnitDbAdapter;
 import org.apache.cayenne.unit.di.server.CayenneProjects;
 import org.apache.cayenne.unit.di.server.ServerCase;
 import org.apache.cayenne.unit.di.server.UseServerRuntime;
@@ -58,6 +59,9 @@ public class ObjectSelect_AggregateIT extends ServerCase {
     @Inject
     private DBHelper dbHelper;
 
+    @Inject
+    private UnitDbAdapter dbAdapter;
+
     // Format: d/m/YY
     DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, 
Locale.US);
 
@@ -163,6 +167,9 @@ public class ObjectSelect_AggregateIT extends ServerCase {
 
     @Test
     public void testGroupByOp() throws Exception {
+        if(!dbAdapter.supportsExpressionInHaving()) {
+            return;
+        }
         List<Object[]> count = ObjectSelect.query(Artist.class)
                 .columns(
                         Artist.ARTIST_NAME.count(),
@@ -172,8 +179,6 @@ public class ObjectSelect_AggregateIT extends ServerCase {
                 .select(context);
         assertEquals(5L, count.size());
         assertEquals(4L, count.get(1)[0]);
-
-
     }
 
     @Test