Incorporated review comments.

microsoft · Dec 19, 2024 · 286367b · 286367b
1 parent 700153d
commit 286367b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
@@ -1602,7 +1602,7 @@ boolean onDone(TDSReader tdsReader) throws SQLServerException {
                             return false;
 
                         //For Insert, we must fetch additional TDS_DONE token that comes with the actual update count
-                        if (doneToken.cmdIsInsert() &&  (-1 != doneToken.getUpdateCount()) && EXECUTE == executeMethod) {
+                        if ((StreamDone.CMD_INSERT == doneToken.getCurCmd()) &&  (-1 != doneToken.getUpdateCount()) && EXECUTE == executeMethod) {
                             return true;
                         }
 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/StreamDone.java b/src/main/java/com/microsoft/sqlserver/jdbc/StreamDone.java
@@ -231,10 +231,6 @@ final long getUpdateCount() {
         }
     }
 
-    final boolean cmdIsInsert() {
-        return (CMD_INSERT == curCmd);
-    }
-
     final boolean cmdIsDMLOrDDL() {
     	switch (curCmd) {
             case CMD_INSERT:

diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/StatementTest.java
@@ -2713,15 +2713,12 @@ public void setup() throws Exception {
                 try (Statement stmt = con.createStatement()) {
                     TestUtils.dropTriggerIfExists(triggerName, stmt);
                     stmt.executeUpdate("CREATE TABLE " + tableName + " (ID int NOT NULL IDENTITY(1,1) PRIMARY KEY, NAME varchar(32));");
-
                     stmt.executeUpdate("CREATE TABLE " + idTableName  + "(ID int NOT NULL IDENTITY(1,1) PRIMARY KEY);");
-
-                    stmt.executeUpdate("CREATE TRIGGER " + triggerName + " ON " + tableName + " FOR INSERT AS INSERT INTO " + idTableName + " DEFAULT VALUES;");
-
+                    stmt.executeUpdate("CREATE TRIGGER " + triggerName + " ON " + tableName + 
+                            " FOR INSERT AS INSERT INTO " + idTableName + " DEFAULT VALUES;");
                     for (int i = 0; i < NUM_ROWS; i++) {
                         stmt.executeUpdate("INSERT INTO " + tableName + " (NAME) VALUES ('test')");
                     }
-
                 }
                 con.commit();
             }
@@ -3012,5 +3009,5 @@ public void terminate() throws Exception {
             }
         }
     }
-    
+
 }