From daf0ba67a41b5535cbe49b5d48dc28ceb54cc421 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Feb 2022 08:58:21 +1300
Subject: [PATCH] #2547 - CockroachDB - Use ON DISTINCT ... like Postgres and
 Yugabyte

---
 .../main/java/io/ebeaninternal/server/query/CQueryBuilder.java  | 2 +-
 .../src/test/java/org/tests/basic/TestQueryUsingConnection.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
index 7559f7283..77dc2b1e6 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
@@ -757,7 +757,7 @@ final class CQueryBuilder {
   }
 
   boolean isPlatformDistinctOn() {
-    return dbPlatform.isPlatform(Platform.POSTGRES) || dbPlatform.isPlatform(Platform.YUGABYTE);
+    return dbPlatform.isPlatform(Platform.POSTGRES) || dbPlatform.isPlatform(Platform.YUGABYTE) || dbPlatform.isPlatform(Platform.COCKROACH);
   }
 
   boolean isPlatformDistinctNoLobs() {
diff --git a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java
index 4e12f1bc5..3ea035b32 100644
--- a/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java
+++ b/ebean-test/src/test/java/org/tests/basic/TestQueryUsingConnection.java
@@ -35,7 +35,7 @@ public class TestQueryUsingConnection extends BaseTestCase {
     }
   }
 
-  @IgnorePlatform(Platform.SQLSERVER)
+  @IgnorePlatform({Platform.SQLSERVER, Platform.COCKROACH})
   @Test
   public void usingTransaction() {