Fix | Disable unicode char/varchar mapping to nchar/nvarchar against Azure DW

ulvii · ulvii · commit 42fef49eb48c · 2020-01-29T15:13:07.000-08:00
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java
@@ -3573,6 +3573,6 @@ protected void setDestinationTableMetadata(SQLServerResultSet rs) {
     private boolean unicodeConversionRequired(int jdbcType, SSType ssType) {
         return ((java.sql.Types.CHAR == jdbcType || java.sql.Types.VARCHAR == jdbcType
                 || java.sql.Types.LONGNVARCHAR == jdbcType)
-                && (SSType.NCHAR == ssType || SSType.NVARCHAR == ssType || SSType.NVARCHARMAX == ssType));
+                && (SSType.NCHAR == ssType || SSType.NVARCHAR == ssType || SSType.NVARCHARMAX == ssType) && !connection.isAzureDW());
     }
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyColumnMappingTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/BulkCopyColumnMappingTest.java
@@ -365,7 +365,7 @@ public void testInvalidCM() throws SQLException {
             }
         }
     }
-
+    @Tag(Constants.xAzureSQLDW)
     @Test
     @DisplayName("BulkCopy:test unicode char/varchar to nchar/nvarchar")
     public void testUnicodeCharToNchar() throws SQLException, ClassNotFoundException {

Original file line number	Diff line number	Diff line change
`@@ -3573,6 +3573,6 @@ protected void setDestinationTableMetadata(SQLServerResultSet rs) {`
`3573`	`3573`	`private boolean unicodeConversionRequired(int jdbcType, SSType ssType) {`
`3574`	`3574`	`return ((java.sql.Types.CHAR == jdbcType \|\| java.sql.Types.VARCHAR == jdbcType`
`3575`	`3575`	`\|\| java.sql.Types.LONGNVARCHAR == jdbcType)`
`3576`		`- && (SSType.NCHAR == ssType \|\| SSType.NVARCHAR == ssType \|\| SSType.NVARCHARMAX == ssType));`
	`3576`	`+ && (SSType.NCHAR == ssType \|\| SSType.NVARCHAR == ssType \|\| SSType.NVARCHARMAX == ssType) && !connection.isAzureDW());`
`3577`	`3577`	`}`
`3578`	`3578`	`}`
Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ public void testInvalidCM() throws SQLException {`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`	`}`
`368`		`-`
	`368`	`+ @Tag(Constants.xAzureSQLDW)`
`369`	`369`	`@Test`
`370`	`370`	`@DisplayName("BulkCopy:test unicode char/varchar to nchar/nvarchar")`
`371`	`371`	`public void testUnicodeCharToNchar() throws SQLException, ClassNotFoundException {`