Fixed getGeneratedKeys functionality for execute API

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

@@ -705,7 +705,7 @@ final void doExecutePreparedStatement(PrepStmtExecCmd command) throws SQLServerE
         if (EXECUTE_QUERY == executeMethod && null == resultSet) {
             SQLServerException.makeFromDriverError(connection, this, SQLServerException.getErrString("R_noResultset"),
                     null, true);
-        } else if (EXECUTE_UPDATE == executeMethod && null != resultSet) {
+        } else if ((EXECUTE_UPDATE == executeMethod) && (null != resultSet) && !bRequestedGeneratedKeys) {
             SQLServerException.makeFromDriverError(connection, this,
                     SQLServerException.getErrString("R_resultsetGeneratedForUpdate"), null, false);
         }

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

@@ -1601,9 +1601,15 @@
                         if (null != procedureName)
                             return false;
 
+                        //For Insert, we must fetch additional TDS_DONE token that comes with the actual update count
+                        if ((StreamDone.CMD_INSERT == doneToken.getCurCmd()) &&  (-1 != doneToken.getUpdateCount()) && EXECUTE == executeMethod) {
+                            return true;
+                        }
+
                         // Always return all update counts from statements executed through Statement.execute()
-                        if (EXECUTE == executeMethod)
-                            return false;
+                        if (EXECUTE == executeMethod) {
+                           return false;
+                        }
 
                         // Statement.executeUpdate() may or may not return this update count depending on the
                         // setting of the lastUpdateCount connection property:
@@ -2357,17 +2363,27 @@
 
         if (null == autoGeneratedKeys) {
             long orgUpd = updateCount;
+            //
+            //A case of SET NOCOUNT ON and GENERATED KEYS requested
+            //where we may not have received update count but would have already read the resultset
+            //so directly consume it.
+            //
+            if ((executeMethod != EXECUTE_QUERY) && bRequestedGeneratedKeys && (resultSet != null)) {
+                autoGeneratedKeys = resultSet;
+                updateCount = orgUpd;
+            } else {
 
-            // Generated keys are returned in a ResultSet result right after the update count.
-            // Try to get that ResultSet. If there are no more results after the update count,
-            // or if the next result isn't a ResultSet, then something is wrong.
-            if (!getNextResult(true) || null == resultSet) {
-                SQLServerException.makeFromDriverError(connection, this,
-                        SQLServerException.getErrString("R_statementMustBeExecuted"), null, false);
+                // Generated keys are returned in a ResultSet result right after the update count.
+                // Try to get that ResultSet. If there are no more results after the update count,
+                // or if the next result isn't a ResultSet, then something is wrong.
+                if (!getNextResult(true) || null == resultSet) {
+                    SQLServerException.makeFromDriverError(connection, this,
+                            SQLServerException.getErrString("R_statementMustBeExecuted"), null, false);
+                }
+                autoGeneratedKeys = resultSet;
+                updateCount = orgUpd;
             }
 
-            autoGeneratedKeys = resultSet;
-            updateCount = orgUpd;
         }
         loggerExternal.exiting(getClassNameLogging(), "getGeneratedKeys", autoGeneratedKeys);
         return autoGeneratedKeys;
@@ -2616,6 +2632,11 @@
             lock.unlock();
         }
     }
+
+    protected void setAutoGeneratedKey(SQLServerResultSet rs) {
+        autoGeneratedKeys = rs;
+    }
+
 }
 
 

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

@@ -232,7 +232,7 @@ final long getUpdateCount() {
     }
 
     final boolean cmdIsDMLOrDDL() {
-        switch (curCmd) {
+    	switch (curCmd) {
             case CMD_INSERT:
             case CMD_BULKINSERT:
             case CMD_DELETE: