Reverted defaultFlagSet method. It is not required. Server set ANSI_D…

…EFAULTS=ON on LOGIN7 call and CONCAT_NULL_YIELDS_NULL/QUOTED_IDENTIFIER are set ON by default.
microsoft · Mar 3, 2025 · bfad8d7 · bfad8d7
1 parent bb41fb6
commit bfad8d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 33 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -299,12 +299,6 @@ 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;
 
@@ -1819,20 +1813,6 @@ final void setMaxFieldSize(int limit) throws SQLServerException {
         }
     }
 
-    private void setCustomFlags() {
-        try{
-            if (!isQuotedIdentifierOn.equals(OnOffOption.NOT_SET)) {
-                connectionCommand("SET QUOTED_IDENTIFIER " + isQuotedIdentifierOn, "quotedIdentifier");
-            }
-
-            if (!isConcatNullYieldsNullOn.equals(OnOffOption.NOT_SET)) {
-                connectionCommand("SET CONCAT_NULL_YIELDS_NULL " + isConcatNullYieldsNullOn, "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.
@@ -1848,7 +1828,6 @@ final void initResettableValues() {
         sqlWarnings = null;
         sCatalog = originalCatalog;
         databaseMetaData = null;
-        setCustomFlags();
     }
 
     /** Limit for the maximum number of rows returned from queries on this connection */
@@ -3556,9 +3535,9 @@ else if (0 == requestedPacketSize)
                 activeConnectionProperties.setProperty(quotedIdentifierProperty, quotedIdentifierValue);
             }
 
-            isQuotedIdentifierOn = OnOffOption.valueOfString(quotedIdentifierValue);
-            if (!isQuotedIdentifierOn.equals(OnOffOption.NOT_SET)) {
-                connectionCommand("SET QUOTED_IDENTIFIER " + isQuotedIdentifierOn, "quotedIdentifier");
+            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
@@ -3568,9 +3547,10 @@ else if (0 == requestedPacketSize)
                 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");
+
+            String concatNullYieldsOption = OnOffOption.valueOfString(concatNullYieldsNullValue).toString();
+            if (concatNullYieldsOption.compareToIgnoreCase(OnOffOption.OFF.toString()) == 0) {
+                connectionCommand("SET CONCAT_NULL_YIELDS_NULL OFF", "concatNullYields");
             }
 
             // Socket timeout is bounded by loginTimeout during the login phase.

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java b/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.NOT_SET.toString()),
-    CONCAT_NULL_YIELDS_NULL("concatNullYieldsNull", OnOffOption.NOT_SET.toString());
+    QUOTED_IDENTIFIER("quotedIdentifier", OnOffOption.ON.toString()),
+    CONCAT_NULL_YIELDS_NULL("concatNullYieldsNull", OnOffOption.ON.toString());
 
     private final String name;
     private final String defaultValue;
@@ -732,8 +732,7 @@ public String toString() {
 
 enum OnOffOption {
     ON("ON"),
-    OFF("OFF"),
-    NOT_SET("NOT_SET");
+    OFF("OFF");
 
     private final String option;
 
@@ -753,8 +752,6 @@ 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};