Merge branch 'main' into users/muskgupta/githubIssue#2690

Author: muskan124947

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

@@ -1676,7 +1676,10 @@ void enableSSL(String host, int port, String clientCertificate, String clientKey
                     .getProperty(SQLServerDriverStringProperty.TRUST_STORE_TYPE.toString());
 
             if (StringUtils.isEmpty(trustStoreType)) {
-                trustStoreType = SQLServerDriverStringProperty.TRUST_STORE_TYPE.getDefaultValue();
+                trustStoreType = System.getProperty("javax.net.ssl.trustStoreType");
+                if (StringUtils.isEmpty(trustStoreType)) {
+                    trustStoreType = SQLServerDriverStringProperty.TRUST_STORE_TYPE.getDefaultValue(); // Default to JKS if not specified
+                }
             }
 
             String serverCert = con.activeConnectionProperties

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

@@ -450,7 +450,7 @@ static SqlAuthenticationToken getDefaultAzureCredAuthToken(String resource,
                         dacBuilder.additionallyAllowedTenants(additionallyAllowedTenants);
                     }
 
-                    dac = dacBuilder.build();
+                    dac = dacBuilder.build(); // CodeQL [SM05141] This is a client library supporting all scenarios (dev, test, prod, etc.), not just prod environments.
 
                     Credential credential = new Credential(dac);
                     CREDENTIAL_CACHE.put(key, credential);

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

@@ -962,7 +962,7 @@ final void doExecuteStatement(StmtExecCmd execCmd) throws SQLServerException {
             // then add on the query to return them.
             if (RETURN_GENERATED_KEYS == execCmd.autoGeneratedKeys
                     && (EXECUTE_UPDATE == executeMethod || EXECUTE == executeMethod)
-                    && sql.trim().toUpperCase().startsWith("INSERT")) {
+                    && isInsert(sql)) {
                 tdsWriter.writeString(IDENTITY_QUERY);
             }
 

src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java

@@ -2749,6 +2749,31 @@ public void testExecuteUpdateInsertAndGenKeys() {
             }
         }
 
+        /**
+         * Tests executeUpdate for Insert with comments followed by getGenerateKeys
+         *
+         * @throws Exception
+         */
+        @Test
+        public void testExecuteUpdateInsertWithCommentsAndGenKeys() {
+            try (Connection con = getConnection()) {
+                try(Statement stmt = con.createStatement()) {
+                    String sql = "/* my comment */INSERT INTO " + tableName + " (NAME) VALUES('test')";
+                    List<String> lst = Arrays.asList("ID");
+                    String[] arr = lst.toArray(new String[0]);
+                    stmt.executeUpdate(sql, arr);
+                    try (ResultSet generatedKeys = stmt.getGeneratedKeys()) {
+                        if (generatedKeys.next()) {
+                            int id = generatedKeys.getInt(1);
+                            assertEquals(id, 4, "id should have been 4, but received : " + id);
+                        }
+                    }
+                }
+            } catch (SQLException e) {
+                fail(TestResource.getResource("R_unexpectedException") + e.getMessage());
+            }
+        }
+
         /**
          * Tests executeUpdate using PreparedStatement for Insert followed by getGenerateKeys
          *