[CONJ-168] Rewritten batch insert can fail if the first value isn't a…

… parameter
mariadb-corporation · Jul 21, 2015 · 58b62cc · 58b62cc
1 parent 7b629cd
commit 58b62cc
Show file tree

Hide file tree

Showing 5 changed files with 467 additions and 406 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MySQLPreparedStatement.java b/src/main/java/org/mariadb/jdbc/MySQLPreparedStatement.java
@@ -85,8 +85,9 @@ public MySQLPreparedStatement(MySQLConnection connection,
         if(log.isDebugEnabled()) {
             log.debug("Creating prepared statement for " + sql);
         }
+        isInsertRewriteable(sql);
         dQuery = new MySQLParameterizedQuery(Utils.nativeSQL(sql, connection.noBackslashEscapes),
-                connection.noBackslashEscapes);
+                connection.noBackslashEscapes, isRewriteable?firstRewrite.length():-1);
         parametersCleared = true;
     }
 
@@ -194,7 +195,7 @@ public void addBatch(final String sql) throws SQLException {
 
     private void checkBatchFields() {
     	if (batchQueries == null) {
-            batchQueries = new ArrayList<Query>();
+            batchQueries = new ArrayList<>();
         }
     }
 

diff --git a/src/main/java/org/mariadb/jdbc/MySQLStatement.java b/src/main/java/org/mariadb/jdbc/MySQLStatement.java
@@ -1121,7 +1121,7 @@ public int getResultSetType() throws SQLException {
      */
     public void addBatch(final String sql) throws SQLException {
         if (batchQueries == null) {
-            batchQueries = new ArrayList<Query>();
+            batchQueries = new ArrayList<>();
         }
         isInsertRewriteable(sql);
         batchQueries.add(new MySQLQuery(sql));

diff --git a/src/main/java/org/mariadb/jdbc/internal/common/query/MySQLParameterizedQuery.java b/src/main/java/org/mariadb/jdbc/internal/common/query/MySQLParameterizedQuery.java
@@ -67,10 +67,18 @@ public class MySQLParameterizedQuery implements ParameterizedQuery {
     private int paramCount;
     private String query;
     private byte[][] queryPartsArray;
+    private byte[] rewriteFirstPart = null;
 
-    public MySQLParameterizedQuery(String query, boolean noBackslashEscapes) {
+    public MySQLParameterizedQuery(String query, boolean noBackslashEscapes, int rewriteOffset) {
         this.query = query;
         List<String> queryParts = createQueryParts(query, noBackslashEscapes);
+        if (rewriteOffset != -1) {
+            try {
+                rewriteFirstPart = queryParts.get(0).substring(rewriteOffset + 1).getBytes("UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException("UTF-8 not supported", e);
+            }
+        }
         queryPartsArray = new byte[queryParts.size()][];
         for(int i=0;i < queryParts.size(); i++) {
             try {
@@ -95,6 +103,7 @@ public MySQLParameterizedQuery cloneQuery() {
         q.paramCount = paramCount;
         q.query = query;
         q.queryPartsArray = queryPartsArray;
+        q.rewriteFirstPart = rewriteFirstPart;
         return q;
     }
 
@@ -138,7 +147,8 @@ public void writeToRewritablePart(final OutputStream os, int rewriteOffset) thro
         if(queryPartsArray.length == 0) {
             throw new AssertionError("Invalid query, queryParts was empty");
         }
-        os.write(",(".getBytes());
+        os.write((",(").getBytes());
+        os.write(rewriteFirstPart);
         for(int i = 1; i<queryPartsArray.length; i++) {
             parameters[i-1].writeTo(os);
             if(queryPartsArray[i].length != 0)