Merge pull request #73 from v-suhame/dev

Read SQL Server error message if status flag has DONE_ERROR set.

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

@@ -6844,6 +6844,20 @@ final int peekTokenType() throws SQLServerException
 		return currentPacket.payload[payloadOffset] & 0xFF;
 	}
 
+
+	final short peekStatusFlag() throws SQLServerException {
+		// skip the current packet(i.e, TDS packet type) and peek into the status flag (USHORT)
+		if (payloadOffset + 3 <= currentPacket.payloadLength) {
+			short value = Util.readShort(currentPacket.payload, payloadOffset + 1);
+			return value;
+		}
+
+		// as per TDS protocol, TDS_DONE packet should always be followed by status flag
+		// throw exception if status packet is not available 
+		throwInvalidTDS();
+		return 0;
+	}
+
 	final int readUnsignedByte() throws SQLServerException
 	{
 		// Ensure that we have a packet to read from.

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

@@ -327,13 +327,26 @@ boolean onError(TDSReader tdsReader) throws SQLServerException
                 return false;
             }
 
-            boolean onDone(TDSReader tdsReader) throws SQLServerException
-            {
-                // When initializing client-cursored ResultSets, a DONE token
-                // following the column metadata indicates an empty result set.
-                rowCount = 0;
-                return false;
-            }
+			boolean onDone(TDSReader tdsReader) throws SQLServerException {
+				// When initializing client-cursored ResultSets, a DONE token
+				// following the column metadata indicates an empty result set.
+				rowCount = 0;
+
+				// Continue to read the error message if DONE packet has error flag
+				int packetType = tdsReader.peekTokenType();
+				if (TDS.TDS_DONE == packetType) {
+					short status = tdsReader.peekStatusFlag();
+					// check if status flag has DONE_ERROR set i.e., 0x2
+					if ((status & 0x0002) != 0) {
+						// Consume the DONE packet if there is error
+						StreamDone doneToken = new StreamDone();
+						doneToken.setFromTDS(tdsReader);
+						return true;
+					}
+				}
+
+				return false;
+			}
         }
 
         this.stmt = stmtIn;