Custom quotedIdentifier and concatNullYields connection property

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

@@ -1346,8 +1346,8 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      * @return cacheBulkCopyMetadata boolean value
      */
     boolean getcacheBulkCopyMetadata();
-  
-   /**
+
+    /**
      * Returns value of 'retryExec' from Connection String.
      *
      * @param retryExec
@@ -1385,4 +1385,38 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      * @return useFlexibleCallableStatements
      */
     boolean getUseFlexibleCallableStatements();
+
+    /**
+     * Returns value of 'quotedIdentifier' from Connection String.
+     *
+     * @return true
+     *         if quotedIdentifier is set to true, false otherwise
+     */
+    String getQuotedIdentifier();
+
+    /**
+     * Sets the value for 'quotedIdentifier' property
+     *
+     * @param quotedIdentifier
+     *        boolean value
+     * 
+     */
+    void setQuotedIdentifier(String quotedIdentifier);
+
+    /**
+     * Returns value of 'concatNullYieldsNull' from Connection String.
+     *
+     * @return true
+     *         if concatNullYieldsNull is set to true, false otherwise
+     */
+    String getConcatNullYieldsNull();
+
+    /**
+     * Sets the value for 'concatNullYieldsNull' property
+     *
+     * @param concatNullYieldsNull
+     *        boolean value
+     * 
+     */
+    void setConcatNullYieldsNull(String concatNullYieldsNull);
 }

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

@@ -3271,14 +3271,46 @@
 
             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);
+            }
+
+            String quotedIdentifierOption = OnOffOption.valueOfString(quotedIdentifierValue).toString();
+            if (quotedIdentifierOption.compareToIgnoreCase(OnOffOption.OFF.toString()) == 0) {
+                connectionCommand("SET QUOTED_IDENTIFIER OFF", "quotedIdentifier");
+            } else if (quotedIdentifierOption.compareToIgnoreCase(OnOffOption.ON.toString()) == 0) {
+                connectionCommand("SET QUOTED_IDENTIFIER ON", "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");
+
+            } else if (concatNullYieldsNullOption.compareToIgnoreCase(OnOffOption.ON.toString()) == 0) {
+                connectionCommand("SET CONCAT_NULL_YIELDS_NULL ON", "concatNullYieldsNull");
+            }
+
             // Socket timeout is bounded by loginTimeout during the login phase.
             // Reset socket timeout back to the original value.
             tdsChannel.resetTcpSocketTimeout();
 
             if (connectionlogger.isLoggable(Level.FINER)) {
                 connectionlogger.finer(toString() + " End of connect");
             }
-        } catch (SocketException e) {
+        } catch (
+
+        SocketException e) {
             throw new SQLServerException(e.getMessage(), null);
         } finally {
             // once we exit the connect function, the connection can be only in one of two
@@ -4522,6 +4554,7 @@
              */
             boolean commandComplete = false;
             try {
+                newCommand.createCounter(null, activeConnectionProperties);
                 commandComplete = newCommand.execute(tdsChannel.getWriter(), tdsChannel.getReader(newCommand));
             } finally {
                 /*

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

@@ -948,17 +948,15 @@
 
     @Override
     public void setcacheBulkCopyMetadata(boolean cacheBulkCopyMetadata) {
-        setBooleanProperty(connectionProps,
-                SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.toString(),
+        setBooleanProperty(connectionProps, SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.toString(),
                 cacheBulkCopyMetadata);
     }
 
     @Override
     public boolean getcacheBulkCopyMetadata() {
-        boolean defaultValue = SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE
-                .getDefaultValue();
-        return getBooleanProperty(connectionProps,
-                SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.toString(), defaultValue);
+        boolean defaultValue = SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.getDefaultValue();
+        return getBooleanProperty(connectionProps, SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.toString(),
+                defaultValue);
     }
 
     @Override
@@ -1302,7 +1300,6 @@
     @Override
     public void setUseFlexibleCallableStatements(boolean enable) {}
 
-
     /**
      * useFlexibleCallableStatements is temporarily removed.
      * This method is a no-op for backwards compatibility only.
@@ -1393,6 +1390,29 @@
         return getStringProperty(connectionProps, SQLServerDriverStringProperty.RETRY_EXEC.toString(), null);
     }
 
+    @Override
+    public String getQuotedIdentifier() {
+        return getStringProperty(connectionProps, SQLServerDriverStringProperty.QUOTED_IDENTIFIER.toString(),
+                SQLServerDriverStringProperty.QUOTED_IDENTIFIER.getDefaultValue());
+    }
+
+    @Override
+    public void setQuotedIdentifier(String quotedIdentifier) {
+        setStringProperty(connectionProps, SQLServerDriverStringProperty.QUOTED_IDENTIFIER.toString(), quotedIdentifier);
+    }
+
+    @Override
+    public String getConcatNullYieldsNull() {
+        return getStringProperty(connectionProps, SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.toString(),
+                SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.getDefaultValue());
+    }
+
+    @Override
+    public void setConcatNullYieldsNull(String concatNullYieldNull) {
+        setStringProperty(connectionProps, SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.toString(),
+                concatNullYieldNull);
+    }
+
     /**
      * Sets a property string value.
      *

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

@@ -611,7 +611,9 @@
     SERVER_CERTIFICATE("serverCertificate", ""),
     DATETIME_DATATYPE("datetimeParameterType", DatetimeType.DATETIME2.toString()),
     ACCESS_TOKEN_CALLBACK_CLASS("accessTokenCallbackClass", ""),
-    RETRY_EXEC("retryExec", "");
+    RETRY_EXEC("retryExec", ""),
+    QUOTED_IDENTIFIER("quotedIdentifier", OnOffOption.OFF.toString()),
+    CONCAT_NULL_YIELDS_NULL("concatNullYieldsNull", OnOffOption.OFF.toString());
 
     private final String name;
     private final String defaultValue;
@@ -720,6 +722,47 @@
 }
 
 
+enum OnOffOption {
+    ON("ON"),
+    OFF("OFF");
+
+    private final String option;
+
+    private OnOffOption(String option) {
+        this.option = option;
+    }
+
+    @Override
+    public String toString() {
+        return option;
+    }
+
+    static OnOffOption valueOfString(String value) throws SQLServerException {
+        OnOffOption option = null;
+
+        if (value.toLowerCase(Locale.US).equalsIgnoreCase(OnOffOption.ON.toString())) {
+            option = OnOffOption.ON;
+        } else if (value.toLowerCase(Locale.US).equalsIgnoreCase(OnOffOption.OFF.toString())) {
+            option = OnOffOption.OFF;
+        } else {
+            MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_InvalidConnectionSetting"));
+            Object[] msgArgs = {"OnOffOption", value};
+            throw new SQLServerException(form.format(msgArgs), null);
+        }
+        return option;
+    }
+
+    static boolean isValidOnOffOption(String option) {
+        for (OnOffOption t : OnOffOption.values()) {
+            if (option.equalsIgnoreCase(t.toString())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+
 /**
  * Provides methods to connect to a SQL Server database and to obtain information about the JDBC driver.
  */
@@ -774,8 +817,8 @@
                     Boolean.toString(SQLServerDriverBooleanProperty.INTEGRATED_SECURITY.getDefaultValue()), false,
                     TRUE_FALSE),
             new SQLServerDriverPropertyInfo(SQLServerDriverBooleanProperty.USE_DEFAULT_GSS_CREDENTIAL.toString(),
-                    Boolean.toString(SQLServerDriverBooleanProperty.USE_DEFAULT_GSS_CREDENTIAL.getDefaultValue()), false,
-                    TRUE_FALSE),
+                    Boolean.toString(SQLServerDriverBooleanProperty.USE_DEFAULT_GSS_CREDENTIAL.getDefaultValue()),
+                    false, TRUE_FALSE),
             new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.KEY_STORE_AUTHENTICATION.toString(),
                     SQLServerDriverStringProperty.KEY_STORE_AUTHENTICATION.getDefaultValue(), false,
                     new String[] {KeyStoreAuthentication.JAVA_KEYSTORE_PASSWORD.toString()}),
@@ -919,8 +962,8 @@
                     Boolean.toString(SQLServerDriverBooleanProperty.USE_BULK_COPY_FOR_BATCH_INSERT.getDefaultValue()),
                     false, TRUE_FALSE),
             new SQLServerDriverPropertyInfo(SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.toString(),
-                    Boolean.toString(SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.getDefaultValue()),
-                    false, TRUE_FALSE),
+                    Boolean.toString(SQLServerDriverBooleanProperty.ENABLE_BULK_COPY_CACHE.getDefaultValue()), false,
+                    TRUE_FALSE),
             new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.MSI_CLIENT_ID.toString(),
                     SQLServerDriverStringProperty.MSI_CLIENT_ID.getDefaultValue(), false, null),
             new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.toString(),
@@ -954,8 +997,13 @@
             new SQLServerDriverPropertyInfo(SQLServerDriverIntProperty.CONNECT_RETRY_COUNT.toString(),
                     Integer.toString(SQLServerDriverIntProperty.CONNECT_RETRY_COUNT.getDefaultValue()), false, null),
             new SQLServerDriverPropertyInfo(SQLServerDriverIntProperty.CONNECT_RETRY_INTERVAL.toString(),
-                    Integer.toString(SQLServerDriverIntProperty.CONNECT_RETRY_INTERVAL.getDefaultValue()), false,
-                    null),};
+                    Integer.toString(SQLServerDriverIntProperty.CONNECT_RETRY_INTERVAL.getDefaultValue()), false, null),
+            new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.QUOTED_IDENTIFIER.toString(),
+                    SQLServerDriverStringProperty.QUOTED_IDENTIFIER.getDefaultValue(), false,
+                    new String[] {OnOffOption.OFF.toString(), OnOffOption.OFF.toString()}),
+            new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.toString(),
+                    SQLServerDriverStringProperty.CONCAT_NULL_YIELDS_NULL.getDefaultValue(), false,
+                    new String[] {OnOffOption.OFF.toString(), OnOffOption.OFF.toString()}),};
 
     /**
      * Properties that can only be set by using Properties. Cannot set in connection string

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

@@ -244,6 +244,8 @@ protected Object[][] getContents() {
         {"R_AADSecurePrincipalSecretPropertyDescription", "A Secret defined for a registered application which has been granted permission to the database connected."},
         {"R_accessTokenCallbackClassPropertyDescription", "The class to instantiate as the SQLServerAccessTokenCallback for acquiring tokens."},
         {"R_accessTokenCallbackPropertyDescription", "A SQLServerAccessTokenCallback object which is used to call a callback method to return an access token."},
+        {"R_quotedIdentifierPropertyDescription", "Indicates whether quotedIdentifier property is set."},
+        {"R_concatNullYieldsNullPropertyDescription", "Indicates whether concatNullYieldsNull property is set."},
         {"R_noParserSupport", "An error occurred while instantiating the required parser. Error: \"{0}\""},
         {"R_writeOnlyXML", "Cannot read from this SQLXML instance. This instance is for writing data only."},
         {"R_dataHasBeenReadXML", "Cannot read from this SQLXML instance. The data has already been read."},

src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java

@@ -319,6 +319,12 @@ public void testDataSource() throws SQLServerException {
 
         ds.setKeyStorePrincipalId(stringPropValue);
         assertTrue(ds.getKeyStorePrincipalId().equals(stringPropValue));
+
+        ds.setQuotedIdentifier(stringPropValue);
+        assertTrue(ds.getQuotedIdentifier().equals(stringPropValue));
+
+        ds.setConcatNullYieldsNull(stringPropValue);
+        assertTrue(ds.getConcatNullYieldsNull().equals(stringPropValue));
     }
 
     @Test

src/test/java/com/microsoft/sqlserver/jdbc/fmtOnly/ParameterMetaDataTest.java

@@ -77,11 +77,11 @@ public void compareStoredProcTest() throws SQLException {
                 "SELECT cInt FROM " + tableName + " WHERE (cInt + (3 - 5)) = ?",
                 "SELECT cInt FROM " + tableName + " WHERE " + tableName + ".[cInt] = ?",
                 "SELECT cInt FROM " + tableName + " WHERE ? = " + tableName + ".[cInt]",
-                "WITH t1(cInt) AS (SELECT 1), t2(cInt) AS (SELECT 2) SELECT * FROM t1 JOIN t2 ON [t1].\"cInt\" = \"t2\".[cInt] WHERE \"t1\".[cInt] = [t2].\"cInt\" + ?",
+                "WITH t1(cInt) AS (SELECT 1), t2(cInt) AS (SELECT 2) SELECT * FROM t1 JOIN t2 ON [t1].[cInt] = [t2].[cInt] WHERE [t1].[cInt] = [t2].[cInt] + ?",
                 "INSERT INTO " + tableName + "(cInt,cFloat) SELECT 1,1.5 WHERE 1 > ?",
                 "WITH t1(cInt) AS (SELECT 1), t2(cInt) AS (SELECT 2), t3(cInt) AS (SELECT 3) SELECT * FROM t1,t2,t3 WHERE t1.cInt >= ?",
-                "SELECT (1),2,[cInt],\"cFloat\" FROM " + tableName + " WHERE cNvarchar LIKE ?",
-                "WITH t1(cInt) AS (SELECT 1) SELECT * FROM \"t1\"");
+                "SELECT (1),2,[cInt],[cFloat] FROM " + tableName + " WHERE cNvarchar LIKE ?",
+                "WITH t1(cInt) AS (SELECT 1) SELECT * FROM [t1]");
         l.forEach(this::compareFmtAndSp);
     }