[CONJ-706] revert correction that has to be done in 2.5.0, not in 2.4.x

mariadb-corporation · Jun 17, 2019 · fc4a288 · fc4a288
1 parent b8721c9
commit fc4a288
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationSingle.java b/src/main/java/org/mariadb/jdbc/internal/com/read/dao/CmdInformationSingle.java
@@ -128,6 +128,15 @@ public ResultSet getGeneratedKeys(Protocol protocol) {
       return SelectResultSet.createEmptyResultSet();
     }
 
+    //to be removed in 2.5.0. cannot in 2.4.x
+    if (updateCount > 1) {
+      long[] insertIds = new long[(int) updateCount];
+      for (int i = 0; i < updateCount; i++) {
+        insertIds[i] = insertId + i * autoIncrement;
+      }
+      return SelectResultSet.createGeneratedData(insertIds, protocol, true);
+    }
+
     return SelectResultSet.createGeneratedData(new long[]{insertId}, protocol, true);
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/MultiTest.java b/src/test/java/org/mariadb/jdbc/MultiTest.java
@@ -1401,7 +1401,8 @@ public void shouldDuplicateKeyUpdateNotReturnExtraRows() throws Throwable {
         try (ResultSet rs = pstmt.getGeneratedKeys()) {
           assertTrue(rs.next());
           assertEquals(1, rs.getInt(1));
-          assertFalse(rs.next());
+          //will be corrected in 2.5.0
+          //assertTrue(rs.next());
         }
       }
     }