update hasNewTypeDefinitions when setter type changes

microsoft · Mar 29, 2017 · 277b50e · 277b50e
1 parent bbb5e25
commit 277b50e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
@@ -424,7 +424,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
         if (!encryptionMetadataIsRetrieved) {
             hasNewTypeDefinitions = buildPreparedStrings(inOutParam, false);
         }
-        
+
         if ((Util.shouldHonorAEForParameters(stmtColumnEncriptionSetting, connection)) && (0 < inOutParam.length) && !isInternalEncryptionQuery) {
 
             // retrieve paramater encryption metadata if they are not retrieved yet
@@ -435,10 +435,10 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
                 // maxRows is set to 0 when retreving encryption metadata,
                 // need to set it back
                 setMaxRowsAndMaxFieldSize();
-
-                // fix an issue when inserting unicode into non-encrypted nchar column using setString() and AE is on on Connection
-                buildPreparedStrings(inOutParam, true);
             }
+
+            // fix an issue when inserting unicode into non-encrypted nchar column using setString() and AE is on on Connection
+            hasNewTypeDefinitions = buildPreparedStrings(inOutParam, true);
         }
 
         // Start the request and detach the response reader so that we can