|CONJ-264] SQLException when calling PreparedStatement.executeBatch()…

… without calling addBatch().
mariadb-corporation · Mar 7, 2016 · 6634fa5 · 6634fa5
1 parent db08fc1
commit 6634fa5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbServerPreparedStatement.java b/src/main/java/org/mariadb/jdbc/MariaDbServerPreparedStatement.java
@@ -204,8 +204,8 @@ public ResultSetMetaData getMetaData() throws SQLException {
     public int[] executeBatch() throws SQLException {
         checkClose();
         batchResultSet = null;
-        if (parameterCount > 0 && queryParameters.size() == 0) {
-            throw ExceptionMapper.getSqlException("No Parameters set. The command addBatch() must have been set");
+        if (queryParameters.size() == 0) {
+            return new int[0];
         }
         int counter = 0;
         int[] ret = new int[queryParameters.size()];

diff --git a/src/test/java/org/mariadb/jdbc/PreparedStatementTest.java b/src/test/java/org/mariadb/jdbc/PreparedStatementTest.java
@@ -135,4 +135,20 @@ public void testPreparedStatementsWithQuotes() throws SQLException {
         assertEquals(true, rs.getBoolean(4));
     }
 
+    /**
+     * CONJ-264: SQLException when calling PreparedStatement.executeBatch() without calling addBatch().
+     *
+     * @throws SQLException exception
+     */
+    @Test
+    public void testExecuteBatch() throws SQLException {
+        PreparedStatement preparedStatement = sharedConnection.prepareStatement("INSERT INTO table1 VALUE ?");
+        try {
+            int[] result = preparedStatement.executeBatch();
+            assertEquals(0, result.length);
+        } catch (SQLException sqle) {
+            fail("Must not throw error");
+        }
+
+    }
 }