[NOID] fixes #3766 support for JDBC array columns (#3874)

Co-authored-by: Stefan Armbruster <[email protected]>
neo4j-contrib · Dec 19, 2023 · 1033d6d · 1033d6d
1 parent eda49ee
commit 1033d6d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/full/src/main/java/apoc/load/Jdbc.java b/full/src/main/java/apoc/load/Jdbc.java
@@ -265,6 +265,14 @@ private Object convert(Object value, int sqlType) {
             if (Types.DATE == sqlType) {
                 return ((java.sql.Date)value).toLocalDate();
             }
+
+            if (Types.ARRAY == sqlType) {
+                try {
+                    return ((java.sql.Array)value).getArray();
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            }
             return value;
         }
 

diff --git a/full/src/test/java/apoc/load/PostgresJdbcTest.java b/full/src/test/java/apoc/load/PostgresJdbcTest.java
@@ -30,9 +30,11 @@
 import org.testcontainers.containers.PostgreSQLContainer;
 
 import java.sql.SQLException;
+import java.util.Map;
 
 import static apoc.util.TestUtil.testCall;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertArrayEquals;
 
 public class PostgresJdbcTest extends AbstractJdbcTest {
 
@@ -74,6 +76,21 @@ public void testLoadJdbSelect() {
                 (row) -> assertResult(row));
     }
 
+    @Test
+    public void testLoadJdbSelectWithArrays() throws Exception {
+        testCall(db, "CALL apoc.load.jdbc($url,'SELECT * FROM ARRAY_TABLE',[], $config)", Util.map("url", postgress.getJdbcUrl(),
+                        "config", Util.map("schema", "test",
+                                "credentials", Util.map("user", postgress.getUsername(), "password", postgress.getPassword()))),
+                (result) -> {
+                    Map<String, Object> row = (Map<String, Object>)result.get("row");
+                    assertEquals("John", row.get("NAME"));
+                    int[] intVals = (int[])row.get("INT_VALUES");
+                    assertArrayEquals(intVals, new int[]{1, 2, 3});
+                    double[] doubleVals = (double[])row.get("DOUBLE_VALUES");
+                    assertArrayEquals(doubleVals, new double[]{ 1.0, 2.0, 3.0}, 0.01);
+                });
+    }
+
     @Test
     public void testLoadJdbcUpdate() {
         testCall(db, "CALL apoc.load.jdbcUpdate($url,'UPDATE PERSON SET \"SURNAME\" = ? WHERE \"NAME\" = ?', ['DOE', 'John'], $config)",

diff --git a/full/src/test/resources/init_postgres.sql b/full/src/test/resources/init_postgres.sql
@@ -79,4 +79,12 @@ CREATE TABLE PERSON (
     "NULL_DATE" DATE);
 
 INSERT INTO PERSON ("NAME", "SURNAME", "HIRE_DATE", "EFFECTIVE_FROM_DATE", "TEST_TIME", "NULL_DATE")
-VALUES ('John', null, '2017-05-25', '2016-06-22 19:10:25+02', '15:37', null);
+VALUES ('John', null, '2017-05-25', '2016-06-22 19:10:25+02', '15:37', null);
+
+CREATE TABLE ARRAY_TABLE (
+    "NAME" text,
+    "INT_VALUES" int[],
+    "DOUBLE_VALUES" DOUBLE PRECISION[]
+);
+INSERT INTO ARRAY_TABLE ("NAME", "INT_VALUES", "DOUBLE_VALUES")
+VALUES ('John', '{ 1, 2, 3}', '{ 1.0, 2.0, 3.0 }');