From 9b2b2f77874c14f0342e244a4e18324d63504eee Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 8 Nov 2017 00:56:13 +1300
Subject: [PATCH] #1205 - ENH: Add support for raw expression array binding
 with Postgres - e.g. raw(" foo = any(?) ", collection)

---
 .../server/expression/RawExpression.java      |  9 ++++++-
 .../org/tests/query/TestWhereRawClause.java   | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/ebeaninternal/server/expression/RawExpression.java b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
index 7fc0c6dfa..85b593521 100644
--- a/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/RawExpression.java
@@ -5,8 +5,10 @@ import io.ebeaninternal.api.SpiExpression;
 import io.ebeaninternal.api.SpiExpressionRequest;
 import io.ebeaninternal.api.SpiExpressionValidation;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
+import io.ebeaninternal.server.persist.MultiValueWrapper;
 
 import java.io.IOException;
+import java.util.Collection;
 
 class RawExpression extends NonPrepareExpression {
 
@@ -43,7 +45,12 @@ class RawExpression extends NonPrepareExpression {
   public void addBindValues(SpiExpressionRequest request) {
     if (values != null) {
       for (Object value : values) {
-        request.addBindValue(value);
+        if (value instanceof Collection<?>) {
+          // support for Postgres = any(?) type raw expression
+          request.addBindValue(new MultiValueWrapper((Collection<?>)value));
+        } else {
+          request.addBindValue(value);
+        }
       }
     }
   }
diff --git a/src/test/java/org/tests/query/TestWhereRawClause.java b/src/test/java/org/tests/query/TestWhereRawClause.java
index 89bfefcf4..9293a0006 100644
--- a/src/test/java/org/tests/query/TestWhereRawClause.java
+++ b/src/test/java/org/tests/query/TestWhereRawClause.java
@@ -4,12 +4,17 @@ import io.ebean.BaseTestCase;
 import io.ebean.Ebean;
 import io.ebean.Expr;
 import io.ebean.Query;
+import io.ebean.annotation.ForPlatform;
+import io.ebean.annotation.Platform;
+import org.tests.model.basic.Customer;
 import org.tests.model.basic.Order;
 import org.tests.model.basic.OrderDetail;
 import org.tests.model.basic.ResetBasicData;
 import org.junit.Test;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -45,6 +50,25 @@ public class TestWhereRawClause extends BaseTestCase {
 
   }
 
+
+  @Test
+  @ForPlatform(Platform.POSTGRES)
+  public void testRawPostgresArray() {
+
+    ResetBasicData.reset();
+
+    List<String> names = new ArrayList<>();
+    names.add("Rob");
+    names.add("Fiona");
+
+    List<Customer> list = Ebean.find(Customer.class)
+      .where()
+      .raw("name = any(?)", names)
+      .findList();
+
+    assertThat(list).isNotEmpty();
+  }
+
   @Test
   public void testRawWithBindParams() {