From 1d8bb8c8008a31c15afa877c2af7e924d3ac51fc Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 12 May 2016 17:22:40 +1200
Subject: [PATCH] #700 - Postgres ARRAY and JSON expressions cast Long to
 ::integer rather than ::bigint

---
 .../server/core/PostgresCast.java             | 23 ++++-----------
 .../server/core/PostgresCastTest.java         | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java

diff --git a/src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java b/src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java
index 3aa592e6b..7088d3964 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/core/PostgresCast.java
@@ -24,29 +24,18 @@ public class PostgresCast {
       // for exists and not-exists expressions
       return "";
     }
-
-    if (isIntegerType(value)) {
+    if (value instanceof Integer) {
       return asArray ? "::integer[]" : "::integer";
     }
-    if (isNumberType(value)) {
+    if (value instanceof Long) {
+      return asArray ? "::bigint[]" : "::bigint";
+    }
+    if (value instanceof Number) {
       return asArray ? "::decimal[]" : "::decimal";
     }
-    if (isBooleanType(value)) {
+    if (value instanceof Boolean) {
       return asArray ? "::boolean[]" : "::boolean";
     }
-
     return "";
   }
-
-  private static boolean isBooleanType(Object value) {
-    return (value instanceof Boolean);
-  }
-
-  private static boolean isIntegerType(Object value) {
-    return (value instanceof Integer) || (value instanceof Long);
-  }
-
-  private static boolean isNumberType(Object value) {
-    return (value instanceof Number);
-  }
 }
diff --git a/src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java b/src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java
new file mode 100644
index 000000000..ee657bc14
--- /dev/null
+++ b/src/test/java/com/avaje/ebeaninternal/server/core/PostgresCastTest.java
@@ -0,0 +1,28 @@
+package com.avaje.ebeaninternal.server.core;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+
+public class PostgresCastTest {
+
+  @Test
+  public void cast() throws Exception {
+
+    assertThat(PostgresCast.cast(1)).isEqualTo("::integer");
+    assertThat(PostgresCast.cast(1L)).isEqualTo("::bigint");
+    assertThat(PostgresCast.cast(1.0D)).isEqualTo("::decimal");
+    assertThat(PostgresCast.cast("")).isEqualTo("");
+  }
+
+  @Test
+  public void cast1() throws Exception {
+
+    assertThat(PostgresCast.cast(1, true)).isEqualTo("::integer[]");
+    assertThat(PostgresCast.cast(1L, true)).isEqualTo("::bigint[]");
+    assertThat(PostgresCast.cast(1.0D, true)).isEqualTo("::decimal[]");
+    assertThat(PostgresCast.cast("", true)).isEqualTo("");
+  }
+
+}
\ No newline at end of file