From b8b83c2ec81c48925c762adc812390ddda9b24f3 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 4 Feb 2022 16:59:16 +1300
Subject: [PATCH] Update more tests for CockroachDB

---
 .../java/org/tests/basic/encrypt/TestEncrypt.java    |  2 +-
 .../test/java/org/tests/model/tevent/TEventMany.java |  9 +++++----
 .../test/java/org/tests/query/TestQueryAlias.java    |  3 +++
 .../query/aggregation/TestAggregationCount.java      | 12 ++++++------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
index 0189aaf03..ea2e2de5c 100644
--- a/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
+++ b/ebean-test/src/test/java/org/tests/basic/encrypt/TestEncrypt.java
@@ -56,7 +56,7 @@ public class TestEncrypt extends BaseTestCase {
     assertThat(loggedSql.get(1)).contains("left join e_basicenc t1 on t1.id = t0.other_id");
   }
 
-  @IgnorePlatform({Platform.ORACLE, Platform.DB2})
+  @IgnorePlatform({Platform.ORACLE, Platform.DB2, Platform.COCKROACH})
   @Test
   public void asDto() {
     DB.find(EBasicEncrypt.class).delete();
diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java
index a7eabce36..6e3492229 100644
--- a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java
+++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java
@@ -4,6 +4,7 @@ import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Version;
+import java.math.BigDecimal;
 
 @Entity
 public class TEventMany {
@@ -18,12 +19,12 @@ public class TEventMany {
 
   int myUnits;
 
-  double amount;
+  BigDecimal amount;
 
   @Version
   Long version;
 
-  public TEventMany(String description, int myUnits, double amount) {
+  public TEventMany(String description, int myUnits, BigDecimal amount) {
     this.description = description;
     this.myUnits = myUnits;
     this.amount = amount;
@@ -61,11 +62,11 @@ public class TEventMany {
     this.myUnits = myUnits;
   }
 
-  public double getAmount() {
+  public BigDecimal getAmount() {
     return amount;
   }
 
-  public void setAmount(double amount) {
+  public void setAmount(BigDecimal amount) {
     this.amount = amount;
   }
 
diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java
index d3df77f11..e9470dbd8 100644
--- a/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java
+++ b/ebean-test/src/test/java/org/tests/query/TestQueryAlias.java
@@ -3,6 +3,8 @@ package org.tests.query;
 import io.ebean.BaseTestCase;
 import io.ebean.DB;
 import io.ebean.Query;
+import io.ebean.annotation.IgnorePlatform;
+import io.ebean.annotation.Platform;
 import org.junit.jupiter.api.Test;
 import org.tests.model.basic.CKeyParent;
 import org.tests.model.basic.ResetBasicData;
@@ -37,6 +39,7 @@ public class TestQueryAlias extends BaseTestCase {
     assertThat(sql).contains("(myt0.one_key) in (select st0.one_key from ckey_parent st0)");
   }
 
+  @IgnorePlatform(Platform.COCKROACH)
   @Test
   public void testExistsWithConcat() {
 
diff --git a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
index 7a3bdc82c..09e9c5b1e 100644
--- a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
+++ b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java
@@ -25,15 +25,15 @@ public class TestAggregationCount extends BaseTestCase {
   @BeforeAll
   public static void setup() {
     TEventOne one = new TEventOne("first", TEventOne.Status.AA);
-    one.getLogs().add(new TEventMany("all", 1, 10));
-    one.getLogs().add(new TEventMany("be", 2, 12.2));
-    one.getLogs().add(new TEventMany("add", 3, 13));
+    one.getLogs().add(new TEventMany("all", 1, BigDecimal.valueOf(10)));
+    one.getLogs().add(new TEventMany("be", 2, BigDecimal.valueOf(12.2)));
+    one.getLogs().add(new TEventMany("add", 3, BigDecimal.valueOf(13)));
     DB.save(one);
 
     TEventOne two = new TEventOne("second", TEventOne.Status.AA);
-    two.getLogs().add(new TEventMany("at", 10, 10));
-    two.getLogs().add(new TEventMany("add", 30, 13));
-    two.getLogs().add(new TEventMany("alf", 30, 13));
+    two.getLogs().add(new TEventMany("at", 10, BigDecimal.valueOf(10)));
+    two.getLogs().add(new TEventMany("add", 30, BigDecimal.valueOf(13)));
+    two.getLogs().add(new TEventMany("alf", 30, BigDecimal.valueOf(13)));
     DB.save(two);
 
     TEventOne three = new TEventOne("thrird", TEventOne.Status.BB);