Added support for static values within batched insert.

joshmg · joshmg · commit 9b3976eba576 · 2020-04-07T16:16:04.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.softwareverde'
-version '3.2.2'
+version '3.2.3'
 
 apply plugin: 'java'
 apply plugin: 'java-library'
diff --git a/src/main/java/com/softwareverde/database/query/BatchedInsertQuery.java b/src/main/java/com/softwareverde/database/query/BatchedInsertQuery.java
@@ -86,33 +86,41 @@ public String getQueryString() {
             throw new RuntimeException("Invalid parameter count for batched query: " + _query);
         }
 
-        final int writeIndex;
+        final int firstParamParenthesisIndex;
+        final int lastParamParenthesisIndex;
         {
-            final Pattern pattern = BatchedInsertQuery.getMatcher(parameterCountPerBatch);
-            final Matcher matcher = pattern.matcher(_query);
-            if (matcher.find()) {
-                writeIndex = (matcher.start() - 1);
+            final int firstParamIndex = _query.indexOf('?');
+            final int lastParamIndex = _query.lastIndexOf('?');
+
+            {
+                int index = (firstParamIndex - 1);
+                while (_query.charAt(index) != '(') {
+                    index -= 1;
+                }
+                firstParamParenthesisIndex = index;
             }
-            else {
-                writeIndex = _query.length();
+
+            {
+                int index = (lastParamIndex + 1);
+                while (_query.charAt(index) != ')') {
+                    index += 1;
+                }
+                lastParamParenthesisIndex = index;
             }
         }
 
         final StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(_query, 0, writeIndex);
-
-        for (int i = 1; i < batchCount; ++i) {
-            stringBuilder.append("(");
-            for (int j = 0; j < parameterCountPerBatch; ++j) {
-                stringBuilder.append("?");
-                if (j < parameterCountPerBatch - 1) {
-                    stringBuilder.append(", ");
-                }
-            }
-            stringBuilder.append("), ");
+        stringBuilder.append(_query, 0, firstParamParenthesisIndex);
+
+        String delimiter = "";
+        final String parameterList = _query.substring(firstParamParenthesisIndex, (lastParamParenthesisIndex + 1));
+        for (int i = 0; i < batchCount; ++i) {
+            stringBuilder.append(delimiter);
+            stringBuilder.append(parameterList);
+            delimiter = ", ";
         }
 
-        stringBuilder.append(_query.substring(writeIndex));
+        stringBuilder.append(_query.substring(lastParamParenthesisIndex + 1));
 
         return stringBuilder.toString();
     }
diff --git a/src/test/java/com/softwareverde/database/query/BatchedInsertQueryTests.java b/src/test/java/com/softwareverde/database/query/BatchedInsertQueryTests.java
@@ -78,4 +78,42 @@ public void should_create_batched_query_supporting_on_duplicate_key_update() {
         // Assert
         Assert.assertEquals("INSERT INTO table (column0, column1) VALUES (?, ?), (?, ?), (?, ?) ON DUPLICATE KEY UPDATE column1 = NULL", query);
     }
+
+    @Test
+    public void should_create_batched_query_with_static_parameter() {
+        // Setup
+        final int batchSize = 3;
+
+        final BatchedInsertQuery batchedInsertQuery = new BatchedInsertQuery("INSERT INTO table (column0, column1, column2) VALUES (?, ?, 1)");
+
+        for (int i = 0; i < batchSize; ++i) {
+            batchedInsertQuery.setParameter("valueA" + i);
+            batchedInsertQuery.setParameter("valueB" + i);
+        }
+
+        // Action
+        final String query = batchedInsertQuery.getQueryString();
+
+        // Assert
+        Assert.assertEquals("INSERT INTO table (column0, column1, column2) VALUES (?, ?, 1), (?, ?, 1), (?, ?, 1)", query);
+    }
+
+    @Test
+    public void should_create_batched_query_with_batch_size_7_with_static_parameter_and_duplicate_update_clause() {
+        // Setup
+        final int batchSize = 7;
+
+        final BatchedInsertQuery batchedInsertQuery = new BatchedInsertQuery("INSERT INTO table (column0, column1, column2) VALUES (?, 1, ?) ON DUPLICATE KEY UPDATE column1 = VALUE (column1)");
+
+        for (int i = 0; i < batchSize; ++i) {
+            batchedInsertQuery.setParameter("valueA" + i);
+            batchedInsertQuery.setParameter("valueC" + i);
+        }
+
+        // Action
+        final String query = batchedInsertQuery.getQueryString();
+
+        // Assert
+        Assert.assertEquals("INSERT INTO table (column0, column1, column2) VALUES (?, 1, ?), (?, 1, ?), (?, 1, ?), (?, 1, ?), (?, 1, ?), (?, 1, ?), (?, 1, ?) ON DUPLICATE KEY UPDATE column1 = VALUE (column1)", query);
+    }
 }
