Merge pull request #151 from v-suhame/bulkCopy_AE

Bulk copy with AE
microsoft · Feb 17, 2017 · e99f326 · e99f326
2 parents ca59185 + 0418394
commit e99f326
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerBulkCopy.java
@@ -799,11 +799,15 @@ private void writeColumnMetaDataColumnData(TDSWriter tdsWriter,
             isStreaming = (DataTypes.SHORT_VARTYPE_MAX_BYTES < bulkPrecision) || (DataTypes.SHORT_VARTYPE_MAX_BYTES < destPrecision);
         }
 
+        CryptoMetadata destCryptoMeta = destColumnMetadata.get(destColumnIndex).cryptoMeta;
+
         /*
-         * if source is encrypted and destination is unenecrypted use destination sql type to send since there is no way of finding if source is
-         * encrypted without accessing the resultset, send destination type if source resultset set is of type SQLServer and encryption is enabled
+         * if source is encrypted and destination is unenecrypted, use destination's sql type to send since there is no way of finding if source is
+         * encrypted without accessing the resultset.
+         * 
+         * Send destination type if source resultset set is of type SQLServer, encryption is enabled and destination column is not encrypted
          */
-        if ((sourceResultSet instanceof SQLServerResultSet) && (connection.isColumnEncryptionSettingEnabled())) {
+        if ((sourceResultSet instanceof SQLServerResultSet) && (connection.isColumnEncryptionSettingEnabled()) && (null != destCryptoMeta)) {
             bulkJdbcType = destColumnMetadata.get(destColumnIndex).jdbcType;
             bulkPrecision = destPrecision;
             bulkScale = destColumnMetadata.get(destColumnIndex).scale;
@@ -839,8 +843,7 @@ else if (((java.sql.Types.CHAR == bulkJdbcType) || (java.sql.Types.VARCHAR == bu
             writeTypeInfo(tdsWriter, bulkJdbcType, bulkScale, bulkPrecision, destSSType, collation, isStreaming, srcNullable, false);
         }
 
-        CryptoMetadata destCryptoMeta = null;
-        if ((null != (destCryptoMeta = destColumnMetadata.get(destColumnIndex).cryptoMeta))) {
+        if (null != destCryptoMeta) {
             int baseDestJDBCType = destCryptoMeta.baseTypeInfo.getSSType().getJDBCType().asJavaSqlType();
             int baseDestPrecision = destCryptoMeta.baseTypeInfo.getPrecision();
 
@@ -1268,8 +1271,13 @@ private String getDestTypeFromSrcType(int srcColIndx,
         }
         bulkPrecision = validateSourcePrecision(srcPrecision, bulkJdbcType, destPrecision);
 
-        // if encrypted source and unencrypted destination combination
-        if ((sourceResultSet instanceof SQLServerResultSet) && (connection.isColumnEncryptionSettingEnabled())) {
+        /*
+         * if source is encrypted and destination is unenecrypted, use destination's sql type to send since there is no way of finding if source is
+         * encrypted without accessing the resultset.
+         * 
+         * Send destination type if source resultset set is of type SQLServer, encryption is enabled and destination column is not encrypted
+         */
+        if ((sourceResultSet instanceof SQLServerResultSet) && (connection.isColumnEncryptionSettingEnabled()) && (null != destCryptoMeta)) {
             bulkJdbcType = destColumnMetadata.get(destColIndx).jdbcType;
             bulkPrecision = destPrecision;
             bulkScale = destColumnMetadata.get(destColIndx).scale;