fix statement getGenerateKeys() throwing an error is query starts with a comment (#2731)

close #2729

Co-authored-by: Naji Astier <[email protected]>

Author: Ananya2

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
          *