Merge remote-tracking branch 'upstream/master'

ebean-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>ebean-parent</artifactId>
     <groupId>io.ebean</groupId>
-    <version>12.15.0-SNAPSHOT</version>
+    <version>12.15.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>ebean-core</artifactId>
@@ -35,19 +35,19 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-api</artifactId>
-      <version>12.15.0-SNAPSHOT</version>
+      <version>12.15.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core-type</artifactId>
-      <version>12.15.0-SNAPSHOT</version>
+      <version>12.15.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-externalmapping-api</artifactId>
-      <version>12.15.0-SNAPSHOT</version>
+      <version>12.15.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>

ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -283,7 +283,7 @@ public final class InternalConfiguration {
 
   private MultiValueBind createMultiValueBind(Platform platform) {
     // only Postgres at this stage
-    if (platform.base() == Platform.POSTGRES) {
+    if (platform.base() == Platform.POSTGRES || platform.base() == Platform.YUGABYTE) {
       return new PostgresMultiValueBind();
     }
     return new MultiValueBind();

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);
+    return dbPlatform.isPlatform(Platform.POSTGRES) || dbPlatform.isPlatform(Platform.YUGABYTE);
   }
 
   boolean isPlatformDistinctNoLobs() {

ebean-core/src/main/java/io/ebeaninternal/server/type/ArrayElementConverter.java

@@ -1,7 +1,9 @@
 package io.ebeaninternal.server.type;
 
 import io.ebean.core.type.ScalarType;
+import io.ebeaninternal.server.core.BasicTypeConverter;
 
+import java.math.BigDecimal;
 import java.util.UUID;
 
 /**
@@ -48,6 +50,8 @@ interface ArrayElementConverter<T> {
    */
   ArrayElementConverter<Double> DOUBLE = new DoubleConverter();
 
+  ArrayElementConverter<BigDecimal> BIG_DECIMAL = new BigDecimalConverter();
+
   class LongConverter implements ArrayElementConverter<Long> {
 
     @Override
@@ -99,6 +103,23 @@ interface ArrayElementConverter<T> {
     }
   }
 
+  class BigDecimalConverter implements ArrayElementConverter<BigDecimal> {
+
+    @Override
+    public BigDecimal fromSerialized(Object rawValue) {
+      return fromDbArray(rawValue);
+    }
+
+    @Override
+    public BigDecimal fromDbArray(Object rawValue) {
+      if (rawValue instanceof BigDecimal) {
+        return (BigDecimal) rawValue;
+      } else {
+        return BasicTypeConverter.toBigDecimal(rawValue);
+      }
+    }
+  }
+
   /**
    * String converter (noop based).
    */

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java

@@ -13,6 +13,7 @@ import io.ebeaninternal.json.ModifyAwareList;
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.ArrayList;
@@ -59,6 +60,9 @@ class ScalarTypeArrayList extends ScalarTypeArrayBase<List> implements ScalarTyp
         if (valueType.equals(Double.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "float", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE));
         }
+        if (valueType.equals(BigDecimal.class)) {
+          return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "decimal", DocPropertyType.DOUBLE, ArrayElementConverter.BIG_DECIMAL));
+        }
         if (valueType.equals(String.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayList(nullable, "varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING));
         }

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayListH2.java

@@ -5,6 +5,7 @@ import io.ebean.core.type.DocPropertyType;
 import io.ebean.core.type.ScalarType;
 
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.HashMap;
@@ -50,6 +51,9 @@ final class ScalarTypeArrayListH2 extends ScalarTypeArrayList {
         if (valueType.equals(Double.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "float", DocPropertyType.DOUBLE, ArrayElementConverter.DOUBLE));
         }
+        if (valueType.equals(BigDecimal.class)) {
+          return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "float", DocPropertyType.DOUBLE, ArrayElementConverter.BIG_DECIMAL));
+        }
         if (valueType.equals(String.class)) {
           return cache.computeIfAbsent(key, s -> new ScalarTypeArrayListH2(nullable, "varchar", DocPropertyType.TEXT, ArrayElementConverter.STRING));
         }