Updated logic for null handling

Author: muskan124947

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java

@@ -2193,7 +2193,7 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
                         }
 
                         SQLServerBulkBatchInsertRecord batchRecord = new SQLServerBulkBatchInsertRecord(
-                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, connection.getDatabaseCollation().getIsCaseSensitive());
+                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, isDBColationCaseSensitive());
 
                         for (int i = 1; i <= rs.getColumnCount(); i++) {
                             Column c = rs.getColumn(i);
@@ -2211,15 +2211,15 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
                             }
                             if (null != bcOperationColumnList && !bcOperationColumnList.isEmpty()) {
                                 // connection contains database name
-                                boolean isCaseSensitive = connection.getDatabaseCollation().getIsCaseSensitive();
-                                int columnIndex;
+                                boolean isCaseSensitive = isDBColationCaseSensitive();
+                                int columnIndex = -1;
                                 if (isCaseSensitive) {
                                     columnIndex = bcOperationColumnList.indexOf(c.getColumnName());
                                 } else {
                                     // find index ignore case
-                                    columnIndex = -1;
                                     for (int opi = 0; opi < bcOperationColumnList.size(); opi++) {
-                                        if (bcOperationColumnList.get(opi).equalsIgnoreCase(c.getColumnName())) {
+                                        String opCol = bcOperationColumnList.get(opi);
+                                        if (opCol != null && opCol.equalsIgnoreCase(c.getColumnName())) {
                                             columnIndex = opi;
                                             break;
                                         }
@@ -2401,7 +2401,7 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
                         }
 
                         SQLServerBulkBatchInsertRecord batchRecord = new SQLServerBulkBatchInsertRecord(
-                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, connection.getDatabaseCollation().getIsCaseSensitive());
+                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, isDBColationCaseSensitive());
 
                         for (int i = 1; i <= rs.getColumnCount(); i++) {
                             Column c = rs.getColumn(i);
@@ -2493,6 +2493,12 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
         }
     }
 
+    private boolean isDBColationCaseSensitive() throws SQLServerException {
+        if (null == connection.getDatabaseCollation())
+            return false;
+        return connection.getDatabaseCollation().getIsCaseSensitive();
+    }
+
     private void checkValidColumns(TypeInfo ti) throws SQLServerException {
         int jdbctype = ti.getSSType().getJDBCType().getIntValue();
         String typeName;

src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java

@@ -572,6 +572,7 @@ public void testBatchStatementCancellation() throws Exception {
     }
 
     @Test
+    @Tag(Constants.xAzureSQLDB)
     public void testExecuteBatchColumnCaseMismatch_CI() throws Exception {
         String connectionStringCollationCaseInsensitive = TestUtils.addOrOverrideProperty(connectionString, "databaseName", caseInsensitiveDatabase);
         String tableName = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("caseInsensitiveTable"));
@@ -605,6 +606,7 @@ public void testExecuteBatchColumnCaseMismatch_CI() throws Exception {
 
     // adapter Azure pipeline CI, need to add a new environment variable `mssql_jdbc_test_connection_properties_collation_cs`
     @Test
+    @Tag(Constants.xAzureSQLDB)
     public void testExecuteBatchColumnCaseMismatch_CS_throwException() throws Exception {
         String connectionStringCollationCaseSensitive = TestUtils.addOrOverrideProperty(connectionString, "databaseName", caseSensitiveDatabase);
         String tableName = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("caseSensitiveTable"));
@@ -643,6 +645,7 @@ public void testExecuteBatchColumnCaseMismatch_CS_throwException() throws Except
 
     // adapter Azure pipeline CI, need to add a new environment variable `mssql_jdbc_test_connection_properties_collation_cs`
     @Test
+    @Tag(Constants.xAzureSQLDB)
     public void testExecuteBatchColumnCaseMismatch_CS() throws Exception {
         String connectionStringCollationCaseSensitive = TestUtils.addOrOverrideProperty(connectionString, "databaseName", caseSensitiveDatabase);
         String tableName = AbstractSQLGenerator.escapeIdentifier(RandomUtil.getIdentifier("caseSensitiveTable"));