Batch insert: fix inserting constant 'null'

Fixes #1761
jdbi · Sep 24, 2020 · 82a6d02 · 82a6d02
1 parent ad2ccfc
commit 82a6d02
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/core/src/main/java/org/jdbi/v3/core/internal/IterableLike.java b/core/src/main/java/org/jdbi/v3/core/internal/IterableLike.java
@@ -43,9 +43,10 @@ private IterableLike() {
      * @return whether {@code IterableLike} can iterate over the given object
      */
     public static boolean isIterable(Object maybeIterable) {
-        return maybeIterable instanceof Iterator<?>
-            || maybeIterable instanceof Iterable<?>
-            || maybeIterable.getClass().isArray();
+        return  maybeIterable != null
+            && (maybeIterable instanceof Iterator<?>
+            ||  maybeIterable instanceof Iterable<?>
+            ||  maybeIterable.getClass().isArray());
     }
 
     /**

diff --git a/sqlobject/src/test/java/org/jdbi/v3/sqlobject/TestBatching.java b/sqlobject/src/test/java/org/jdbi/v3/sqlobject/TestBatching.java
@@ -67,6 +67,21 @@ public void testInsertSingleIteratorNoTx() {
         assertThat(b.size()).isEqualTo(2);
     }
 
+    @Test
+    public void testBindConstantNull() {
+        UsesBatching b = handle.attach(UsesBatching.class);
+        List<Integer> ids = Arrays.asList(1, 2, 3, 4, 5);
+
+        b.withConstantValue(ids, null);
+
+        assertThat(b.size()).isEqualTo(5);
+
+        List<String> names = handle.createQuery("select distinct name from something")
+                                   .mapTo(String.class)
+                                   .list();
+        assertThat(names).containsExactly((String) null);
+    }
+
     @Test
     public void testBindConstantValue() {
         UsesBatching b = handle.attach(UsesBatching.class);