fix(batch): improve column metadata handling for batch execution

- Update column index search to be case-insensitive in SQLServerPreparedStatement - Remove failing test case in BatchExecutionTest that was checking for specific exception
microsoft · Jan 21, 2025 · 719687f · 719687f
1 parent 2b29dfb
commit 719687f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
@@ -2210,7 +2210,14 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
                                 jdbctype = ti.getSSType().getJDBCType().getIntValue();
                             }
                             if (null != bcOperationColumnList && !bcOperationColumnList.isEmpty()) {
-                                int columnIndex = bcOperationColumnList.indexOf(c.getColumnName());
+                                // find index ignore case
+                                int columnIndex = -1;
+                                for (int opi = 0; opi < bcOperationColumnList.size(); opi++) {
+                                    if (bcOperationColumnList.get(opi).equalsIgnoreCase(c.getColumnName())) {
+                                        columnIndex = opi;
+                                    }
+                                }
+
                                 if (columnIndex > -1) {
                                     columnMappings.put(columnIndex + 1, i);
                                     batchRecord.addColumnMetadata(columnIndex + 1, c.getColumnName(), jdbctype,

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java
@@ -600,13 +600,7 @@ public void testExecuteBatchColumnCaseMismatch() throws Exception {
                 preparedStatement.addBatch();
                 preparedStatement.setObject(1, "value2");
                 preparedStatement.addBatch();
-                try {
-                    preparedStatement.executeBatch();
-                    fail("Should have failed");
-                } catch (Exception ex) {
-                    assertInstanceOf(SQLServerException.class, ex);
-                    assertEquals("Unable to retrieve column metadata.", ex.getMessage());
-                }
+                preparedStatement.executeBatch();
             }
         }
     }