[CONJ-270] permit 65535 parameters to server preparedStatement

mariadb-corporation · Apr 4, 2016 · 171b1ab · 171b1ab
1 parent ae64162
commit 171b1ab
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/internal/packet/send/SendExecutePrepareStatementPacket.java b/src/main/java/org/mariadb/jdbc/internal/packet/send/SendExecutePrepareStatementPacket.java
@@ -103,7 +103,7 @@ public void send(final OutputStream os) throws IOException {
                     nullBitsBuffer[i / 8] |= (1 << (i % 8));
                 }
             }
-            buffer.buffer.put(nullBitsBuffer);/*Null Bit Map*/
+            buffer.write(nullBitsBuffer);/*Null Bit Map*/
 
             //check if parameters type (using setXXX) have change since previous request, and resend new header type if so
             boolean mustSendHeaderType = false;

diff --git a/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java b/src/main/java/org/mariadb/jdbc/internal/protocol/AbstractQueryProtocol.java
@@ -152,8 +152,8 @@ public PrepareResult prepare(String sql, boolean forceNew) throws QueryException
                 /* Prepared Statement OK */
                 buffer.readByte(); /* skip field count */
                 final int statementId = buffer.readInt();
-                final int numColumns = buffer.readShort();
-                final int numParams = buffer.readShort();
+                final int numColumns = buffer.readShort() & 0xffff;
+                final int numParams = buffer.readShort() & 0xffff;
                 buffer.readByte(); // reserved
                 this.hasWarnings = buffer.readShort() > 0;
                 ColumnInformation[] params = new ColumnInformation[numParams];

diff --git a/src/test/java/org/mariadb/jdbc/PreparedStatementTest.java b/src/test/java/org/mariadb/jdbc/PreparedStatementTest.java
@@ -190,6 +190,7 @@ public void testCallExecuteErrorBatch() throws SQLException {
             assertTrue(sqle.getMessage().contains("INSERT INTO INCORRECT_QUERY"));
         }
     }
+
     @Test
     public void testRewriteMultiPacket() throws SQLException {
         Statement statement = sharedConnection.createStatement();
@@ -229,7 +230,7 @@ public void testRewriteMultiPacket() throws SQLException {
 
     /**
      * CONJ-273: permit client PrepareParameter without parameters.
-     * @throws Throwable
+     * @throws Throwable exception
      */
     @Test
     public void clientPrepareStatementWithoutParameter() throws Throwable {

diff --git a/src/test/java/org/mariadb/jdbc/ServerPrepareStatementTest.java b/src/test/java/org/mariadb/jdbc/ServerPrepareStatementTest.java
@@ -755,4 +755,24 @@ public void testPrepareStatementCache() throws Throwable {
             }
         }
     }
+
+    /**
+     * CONJ-270 : permit to have more than 32768 parameters.
+     * @throws SQLException exception
+     */
+    @Test
+    public void testRewriteMultiPacket() throws SQLException {
+        createTable("PreparedStatementTest3", "id int");
+        String sql = "INSERT INTO PreparedStatementTest3 VALUES (?)";
+        for (int i = 1 ; i < 65535 ; i++) {
+            sql += ",(?)";
+        }
+        PreparedStatement pstmt = sharedConnection.prepareStatement(sql);
+        for (int i = 1; i < 65536; i++) {
+            pstmt.setInt(i, i);
+        }
+        pstmt.execute();
+    }
+
+
 }