Added one more state - NOT_SET for QUOTED_IDENTIFIER and CONCAT_NULL_YIELDS_NULL flag

Author: Divang Sharma

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

@@ -299,6 +299,12 @@ public String toString() {
     /** flag indicating whether prelogin TLS handshake is required */
     private boolean isTDS8 = false;
 
+    /** flag to indicating whether QUOTED_IDENTIFIER is ON/OFF */
+    private OnOffOption isQuotedIdentifierOn = OnOffOption.NOT_SET;
+    
+    /** flag to indicating whether CONCAT_NULL_YIELDS_NULL is ON/OFF */
+    private OnOffOption isConcatNullYieldsNullOn = OnOffOption.NOT_SET;
+    
     /** encrypted truststore password */
     byte[] encryptedTrustStorePassword = null;
 
@@ -1813,6 +1819,20 @@ final void setMaxFieldSize(int limit) throws SQLServerException {
         }
     }
 
+    private void setCustomFlags() {
+        try{
+            if (OnOffOption.OFF.equals(isQuotedIdentifierOn)) {
+                connectionCommand("SET QUOTED_IDENTIFIER OFF", "quotedIdentifier");
+            }
+
+            if (OnOffOption.OFF.equals(isConcatNullYieldsNullOn)) {
+                connectionCommand("SET CONCAT_NULL_YIELDS_NULL OFF", "concatNullYieldsNull");
+            }
+        } catch(SQLServerException e) {
+            loggerExternal.log(Level.WARNING, "Error setting QUOTED_IDENTIFIER and CONCAT_NULL_YIELDS_NULL properties", e);
+        }
+    }
+
     /**
      * This function is used both to init the values on creation of connection and resetting the values after the
      * connection is released to the pool for reuse.
@@ -1828,36 +1848,7 @@ final void initResettableValues() {
         sqlWarnings = null;
         sCatalog = originalCatalog;
         databaseMetaData = null;
-
-        try{
-            // check QUOTED_IDENTIFIER property
-            String quotedIdentifierProperty = SQLServerDriverStringProperty.QUOTED_IDENTIFIER.toString();
-            String quotedIdentifierValue = activeConnectionProperties.getProperty(quotedIdentifierProperty);
-            if (null == quotedIdentifierValue) {
-                quotedIdentifierValue = SQLServerDriverStringProperty.QUOTED_IDENTIFIER.getDefaultValue();
-                activeConnectionProperties.setProperty(quotedIdentifierProperty, quotedIdentifierValue);
-            }
-
-            String quotedIdentifierOption = OnOffOption.valueOfString(quotedIdentifierValue).toString();
-            if (quotedIdentifierOption.compareToIgnoreCase(OnOffOption.OFF.toString()) == 0) {
-                connectionCommand("SET QUOTED_IDENTIFIER OFF", "quotedIdentifier");
-            }
-
-            // check CONCAT_NULL_YIELDS_NULL property
-            String concatNullYieldsNullProperty = SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.toString();
-            String concatNullYieldsNullValue = activeConnectionProperties.getProperty(concatNullYieldsNullProperty);
-            if (null == concatNullYieldsNullValue) {
-                concatNullYieldsNullValue = SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.getDefaultValue();
-                activeConnectionProperties.setProperty(concatNullYieldsNullProperty, concatNullYieldsNullValue);
-            }
-            String concatNullYieldsNullOption = OnOffOption.valueOfString(concatNullYieldsNullValue).toString();
-            if (concatNullYieldsNullOption.compareToIgnoreCase(OnOffOption.OFF.toString()) == 0) {
-                connectionCommand("SET CONCAT_NULL_YIELDS_NULL OFF", "concatNullYieldsNull");
-
-            }
-        } catch(SQLServerException e) {
-            loggerExternal.log(Level.WARNING, "Error setting QUOTED_IDENTIFIER and CONCAT_NULL_YIELDS_NULL properties", e);
-        }
+        setCustomFlags();
     }
 
     /** Limit for the maximum number of rows returned from queries on this connection */
@@ -3557,6 +3548,31 @@ else if (0 == requestedPacketSize)
 
             state = State.OPENED;
 
+            // check QUOTED_IDENTIFIER property
+            String quotedIdentifierProperty = SQLServerDriverStringProperty.QUOTED_IDENTIFIER.toString();
+            String quotedIdentifierValue = activeConnectionProperties.getProperty(quotedIdentifierProperty);
+            if (null == quotedIdentifierValue) {
+                quotedIdentifierValue = SQLServerDriverStringProperty.QUOTED_IDENTIFIER.getDefaultValue();
+                activeConnectionProperties.setProperty(quotedIdentifierProperty, quotedIdentifierValue);
+            }
+
+            isQuotedIdentifierOn = OnOffOption.valueOfString(quotedIdentifierValue);
+            if (!isQuotedIdentifierOn.equals(OnOffOption.NOT_SET)) {
+                connectionCommand("SET QUOTED_IDENTIFIER " + isQuotedIdentifierOn, "quotedIdentifier");
+            }
+
+            // check CONCAT_NULL_YIELDS_NULL property
+            String concatNullYieldsNullProperty = SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.toString();
+            String concatNullYieldsNullValue = activeConnectionProperties.getProperty(concatNullYieldsNullProperty);
+            if (null == concatNullYieldsNullValue) {
+                concatNullYieldsNullValue = SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.getDefaultValue();
+                activeConnectionProperties.setProperty(concatNullYieldsNullProperty, concatNullYieldsNullValue);
+            }
+            isConcatNullYieldsNullOn = OnOffOption.valueOfString(concatNullYieldsNullValue);
+            if (!isConcatNullYieldsNullOn.equals(OnOffOption.NOT_SET)) {
+                connectionCommand("SET CONCAT_NULL_YIELDS_NULL " + isConcatNullYieldsNullOn, "concatNullYieldsNull");
+            }
+
             // Socket timeout is bounded by loginTimeout during the login phase.
             // Reset socket timeout back to the original value.
             tdsChannel.resetTcpSocketTimeout();

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

@@ -613,8 +613,8 @@ enum SQLServerDriverStringProperty {
     ACCESS_TOKEN_CALLBACK_CLASS("accessTokenCallbackClass", ""),
     RETRY_EXEC("retryExec", ""),
     RETRY_CONN("retryConn", ""),
-    QUOTED_IDENTIFIER("quotedIdentifier", OnOffOption.OFF.toString()),
-    CONCAT_NULL_YIELDS_NULL("concatNullYieldsNull", OnOffOption.OFF.toString());
+    QUOTED_IDENTIFIER("quotedIdentifier", OnOffOption.NOT_SET.toString()),
+    CONCAT_NULL_YIELDS_NULL("concatNullYieldsNull", OnOffOption.NOT_SET.toString());
 
     private final String name;
     private final String defaultValue;
@@ -732,7 +732,8 @@ public String toString() {
 
 enum OnOffOption {
     ON("ON"),
-    OFF("OFF");
+    OFF("OFF"),
+    NOT_SET("NOT_SET");
 
     private final String option;
 
@@ -752,6 +753,8 @@ static OnOffOption valueOfString(String value) throws SQLServerException {
             option = OnOffOption.ON;
         } else if (value.toLowerCase(Locale.US).equalsIgnoreCase(OnOffOption.OFF.toString())) {
             option = OnOffOption.OFF;
+        } else if (value.toLowerCase(Locale.US).equalsIgnoreCase(OnOffOption.NOT_SET.toString())) {
+            option = OnOffOption.NOT_SET;
         } else {
             MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_InvalidConnectionSetting"));
             Object[] msgArgs = {"OnOffOption", value};