Revert "Properly Insert Accented Characters When Using Bulk Copy and Non-Unic…" (#2736)

muskan124947 · web-flow · commit 44d601047745 · 2025-08-12T13:58:21.000+05:30
This reverts commit 1dc9eb7.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkBatchInsertRecord.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkBatchInsertRecord.java
@@ -7,7 +7,6 @@
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.nio.charset.Charset;
 import java.sql.Types;
 import java.text.DecimalFormat;
 import java.text.MessageFormat;
@@ -35,7 +34,6 @@ class SQLServerBulkBatchInsertRecord extends SQLServerBulkRecord {
     private int batchParamIndex = -1;
     private List<String> columnList;
     private List<String> valueList;
-    private Charset charset;
 
     /*
      * Class name for logging.
@@ -46,10 +44,10 @@ class SQLServerBulkBatchInsertRecord extends SQLServerBulkRecord {
      * Constructs a SQLServerBulkBatchInsertRecord with the batch parameter, column list, value list, and encoding
      */
     SQLServerBulkBatchInsertRecord(ArrayList<Parameter[]> batchParam, ArrayList<String> columnList,
-            ArrayList<String> valueList, Charset charset, boolean columnNameCaseSensitive) throws SQLServerException {
+            ArrayList<String> valueList, String encoding, boolean columnNameCaseSensitive) throws SQLServerException {
         initLoggerResources();
         if (loggerExternal.isLoggable(java.util.logging.Level.FINER)) {
-            loggerExternal.entering(loggerPackageName, loggerClassName, new Object[] {batchParam, charset.name()});
+            loggerExternal.entering(loggerPackageName, loggerClassName, new Object[] {batchParam, encoding});
         }
 
         if (null == batchParam) {
@@ -64,7 +62,6 @@ class SQLServerBulkBatchInsertRecord extends SQLServerBulkRecord {
         this.columnList = columnList;
         this.valueList = valueList;
         this.columnNameCaseSensitive = columnNameCaseSensitive;
-        this.charset = charset;
         columnMetadata = new HashMap<>();
 
         loggerExternal.exiting(loggerPackageName, loggerClassName);
@@ -196,7 +193,7 @@ else if (dateTimeFormatter != null)
                  * If the data is already a string, return it as is.
                  */
                 if (data instanceof byte[]) {
-                    return new String((byte[]) data, charset);
+                    return new String((byte[]) data);
                 }
                 return data;
             }
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
@@ -2218,8 +2218,7 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
                         }
 
                         SQLServerBulkBatchInsertRecord batchRecord = new SQLServerBulkBatchInsertRecord(
-                                batchParamValues, bcOperationColumnList, bcOperationValueList, 
-                                connection.getDatabaseCollation().getCharset(), isDBColationCaseSensitive());
+                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, isDBColationCaseSensitive());
 
                         for (int i = 1; i <= rs.getColumnCount(); i++) {
                             Column c = rs.getColumn(i);
@@ -2427,8 +2426,7 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
                         }
 
                         SQLServerBulkBatchInsertRecord batchRecord = new SQLServerBulkBatchInsertRecord(
-                                batchParamValues, bcOperationColumnList, bcOperationValueList, 
-                                connection.getDatabaseCollation().getCharset(), isDBColationCaseSensitive());
+                                batchParamValues, bcOperationColumnList, bcOperationValueList, null, isDBColationCaseSensitive());
 
                         for (int i = 1; i <= rs.getColumnCount(); i++) {
                             Column c = rs.getColumn(i);
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/preparedStatement/BatchExecutionWithBulkCopyTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/preparedStatement/BatchExecutionWithBulkCopyTest.java
@@ -1408,76 +1408,82 @@ private void getCreateTableTemporalSQL(String tableName) throws SQLException {
     }
 
     /**
-     * Test string values using prepared statement using accented and unicode characters.
-     * This test covers all combinations of useBulkCopyForBatchInsert and sendStringParametersAsUnicode.
-     * 
-     * @throws Exception
+     * Test batch insert using bulk copy with string values when setSendStringParametersAsUnicode is true.
      */
     @Test
-    public void testBulkInsertStringAllCombinations() throws Exception {
-        boolean[] bulkCopyOptions = { true, false };
-        boolean[] unicodeOptions = { true, false };
-        for (boolean useBulkCopy : bulkCopyOptions) {
-            for (boolean sendUnicode : unicodeOptions) {
-                runBulkInsertStringTest(useBulkCopy, sendUnicode);
+    public void testBulkInsertStringWhenSentAsUnicode() throws Exception {
+        String insertSQL = "INSERT INTO " + AbstractSQLGenerator.escapeIdentifier(tableNameBulkString)
+                + " (charCol, varcharCol, longvarcharCol, ncharCol, nvarcharCol, longnvarcharCol) VALUES (?, ?, ?, ?, ?, ?)";
+
+        String selectSQL = "SELECT charCol, varcharCol, longvarcharCol, ncharCol, nvarcharCol, longnvarcharCol FROM "
+                + AbstractSQLGenerator.escapeIdentifier(tableNameBulkString);
+
+        try (Connection connection = PrepUtil.getConnection(
+                connectionString + ";useBulkCopyForBatchInsert=true;sendStringParametersAsUnicode=true;");
+                SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) connection.prepareStatement(insertSQL);
+                Statement stmt = (SQLServerStatement) connection.createStatement()) {
+
+            getCreateTableWithStringData();
+
+            pstmt.setString(1, "CHAR_VAL");
+            pstmt.setString(2, "VARCHAR_VALUE");
+            pstmt.setString(3, "LONGVARCHAR_VALUE_WITH_MORE_TEXT");
+            pstmt.setString(4, "NCHAR_VAL");
+            pstmt.setString(5, "NVARCHAR_VALUE");
+            pstmt.setString(6, "LONGNVARCHAR_VALUE_WITH_UNICODE_TEXT");
+            pstmt.addBatch();
+            pstmt.executeBatch();
+
+            // Validate inserted data
+            try (ResultSet rs = stmt.executeQuery(selectSQL)) {
+                assertTrue(rs.next(), "Expected at least one row in result set");
+                assertEquals("CHAR_VAL", rs.getString("charCol"));
+                assertEquals("VARCHAR_VALUE", rs.getString("varcharCol"));
+                assertEquals("LONGVARCHAR_VALUE_WITH_MORE_TEXT", rs.getString("longvarcharCol"));
+                assertEquals("NCHAR_VAL", rs.getString("ncharCol"));
+                assertEquals("NVARCHAR_VALUE", rs.getString("nvarcharCol"));
+                assertEquals("LONGNVARCHAR_VALUE_WITH_UNICODE_TEXT", rs.getString("longnvarcharCol"));
+                assertFalse(rs.next());
             }
         }
     }
 
     /**
-     * Test batch insert using accented and unicode characters.
+     * Test batch insert using bulk copy with string values when setSendStringParametersAsUnicode is false.
      */
-    public void runBulkInsertStringTest(boolean useBulkCopy, boolean sendUnicode) throws Exception {
+    @Test
+    public void testBulkInsertStringWhenNotSentAsUnicode() throws Exception {
         String insertSQL = "INSERT INTO " + AbstractSQLGenerator.escapeIdentifier(tableNameBulkString)
-                + " (charCol, varcharCol, longvarcharCol, ncharCol1, nvarcharCol1, longnvarcharCol1, "
-                + "ncharCol2, nvarcharCol2, longnvarcharCol2) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
+                + " (charCol, varcharCol, longvarcharCol, ncharCol, nvarcharCol, longnvarcharCol) VALUES (?, ?, ?, ?, ?, ?)";
 
-        String selectSQL = "SELECT charCol, varcharCol, longvarcharCol, ncharCol1, nvarcharCol1, "
-                + "longnvarcharCol1, ncharCol2, nvarcharCol2, longnvarcharCol2 FROM "
+        String selectSQL = "SELECT charCol, varcharCol, longvarcharCol, ncharCol, nvarcharCol, longnvarcharCol FROM "
                 + AbstractSQLGenerator.escapeIdentifier(tableNameBulkString);
 
         try (Connection connection = PrepUtil.getConnection(
-                connectionString + ";useBulkCopyForBatchInsert=" + useBulkCopy + ";sendStringParametersAsUnicode="
-                        + sendUnicode + ";");
+                connectionString + ";useBulkCopyForBatchInsert=true;sendStringParametersAsUnicode=false;");
                 SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) connection.prepareStatement(insertSQL);
                 Statement stmt = (SQLServerStatement) connection.createStatement()) {
 
             getCreateTableWithStringData();
 
-            String charValue = "Anaïs_Ni";
-            String varcharValue = "café";
-            String longVarcharValue = "Sørén Kierkégaard";
-            String ncharValue1 = "José Müll";
-            String nvarcharValue1 = "José Müller";
-            String longNvarcharValue1 = "François Saldaña";
-            String ncharValue2 = "Test1汉字😀";
-            String nvarcharValue2 = "汉字";
-            String longNvarcharValue2 = "日本語";
-
-            pstmt.setString(1, charValue);
-            pstmt.setString(2, varcharValue);
-            pstmt.setString(3, longVarcharValue);
-            pstmt.setString(4, ncharValue1);
-            pstmt.setString(5, nvarcharValue1);
-            pstmt.setString(6, longNvarcharValue1);
-            pstmt.setNString(7, ncharValue2);
-            pstmt.setNString(8, nvarcharValue2);
-            pstmt.setNString(9, longNvarcharValue2);
+            pstmt.setString(1, "CHAR_VAL");
+            pstmt.setString(2, "VARCHAR_VALUE");
+            pstmt.setString(3, "LONGVARCHAR_VALUE_WITH_MORE_TEXT");
+            pstmt.setString(4, "NCHAR_VAL");
+            pstmt.setString(5, "NVARCHAR_VALUE");
+            pstmt.setString(6, "LONGNVARCHAR_VALUE_WITH_UNICODE_TEXT");
             pstmt.addBatch();
             pstmt.executeBatch();
 
             // Validate inserted data
             try (ResultSet rs = stmt.executeQuery(selectSQL)) {
                 assertTrue(rs.next(), "Expected at least one row in result set");
-                assertEquals(charValue, rs.getString("charCol"));
-                assertEquals(varcharValue, rs.getString("varcharCol"));
-                assertEquals(longVarcharValue, rs.getString("longvarcharCol"));
-                assertEquals(ncharValue1, rs.getString("ncharCol1"));
-                assertEquals(nvarcharValue1, rs.getString("nvarcharCol1"));
-                assertEquals(longNvarcharValue1, rs.getString("longnvarcharCol1"));
-                assertEquals(ncharValue2, rs.getString("ncharCol2"));
-                assertEquals(nvarcharValue2, rs.getString("nvarcharCol2"));
-                assertEquals(longNvarcharValue2, rs.getString("longnvarcharCol2"));
+                assertEquals("CHAR_VAL", rs.getString("charCol"));
+                assertEquals("VARCHAR_VALUE", rs.getString("varcharCol"));
+                assertEquals("LONGVARCHAR_VALUE_WITH_MORE_TEXT", rs.getString("longvarcharCol"));
+                assertEquals("NCHAR_VAL", rs.getString("ncharCol"));
+                assertEquals("NVARCHAR_VALUE", rs.getString("nvarcharCol"));
+                assertEquals("LONGNVARCHAR_VALUE_WITH_UNICODE_TEXT", rs.getString("longnvarcharCol"));
                 assertFalse(rs.next());
             }
         }
@@ -1487,15 +1493,12 @@ private void getCreateTableWithStringData() throws SQLException {
         try (Statement stmt = connection.createStatement()) {
             TestUtils.dropTableIfExists(AbstractSQLGenerator.escapeIdentifier(tableNameBulkString), stmt);
             String createTableSQL = "CREATE TABLE " + AbstractSQLGenerator.escapeIdentifier(tableNameBulkString) + " (" +
-                    "charCol CHAR(8), " +
-                    "varcharCol VARCHAR(50), " +
-                    "longvarcharCol VARCHAR(MAX), " +
-                    "ncharCol1 NCHAR(9), " +
-                    "nvarcharCol1 NVARCHAR(50), " +
-                    "longnvarcharCol1 NVARCHAR(MAX), " +
-                    "ncharCol2 NCHAR(9), " +
-                    "nvarcharCol2 NVARCHAR(50), " +
-                    "longnvarcharCol2 NVARCHAR(MAX)" + ")";
+                    "charCol CHAR(8) NOT NULL, " +
+                    "varcharCol VARCHAR(50) NOT NULL, " +
+                    "longvarcharCol VARCHAR(MAX) NOT NULL, " +
+                    "ncharCol NCHAR(9) NOT NULL, " +
+                    "nvarcharCol NVARCHAR(50) NOT NULL, " +
+                    "longnvarcharCol NVARCHAR(MAX) NOT NULL" + ")";
 
             stmt.execute(createTableSQL);
         }
