Fix Android V6 issue#562

Author: jepiqueau

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 6.0.0-beta.2 (2024-06-12)
+
+### Bug Fixes
+
+ - Fix Android Multi Row Statement does not suppress control characters ($) issue#562 
+
 # 6.0.0-beta.1 (2024-06-12)
 
 ### Chore

android/.gradle/buildOutputCleanup/buildOutputCleanup.lock

@@ -538,9 +538,21 @@ public String replacePlaceholders(String stmt, String sqlBuilder) {
         if (extractedValues == null) {
             return stmt; // Return the original statement if no placeholders are found
         }
+        // Regex to match the VALUES clause with varying number of placeholders
+        String regex = "(?i)VALUES\\s*\\((\\s*\\?\\s*(?:,\\s*\\?\\s*)*)\\)";
 
-        // Replace placeholders in the stmt with values from sqlBuilder
-        return stmt.replaceFirst("(?i)VALUES \\((\\?(?:,\\s*\\?\\s*)*)\\)", "VALUES " + sqlBuilder);
+        // Create a pattern and matcher
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(stmt);
+
+        // Check if the pattern matches and perform the replacement
+        if (matcher.find()) {
+            // Perform the replacement without causing an IndexOutOfBoundsException
+            String formattedStmt = matcher.replaceAll("VALUES " + Matcher.quoteReplacement(sqlBuilder));
+            return formattedStmt;
+        } else {
+            throw new IllegalArgumentException("The statement does not contain a valid VALUES clause with placeholders.");
+        }
     }
 
     public String extractQuestionMarkValues(String input) {