Skip to content

Add check for deleted rows in resultsets for scrollable & updatable resultsets #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbae merged 2 commits into from
Dec 5, 2017
Merged

Add check for deleted rows in resultsets for scrollable & updatable resultsets #552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0046d3c
fix for 477
peterbae Nov 15, 2017
c006af2
add check for updatable resultsets.
peterbae Nov 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResultSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,10 +962,19 @@ public boolean next() throws SQLServerException {

// For scrollable cursors, next() is just a special case of relative()
if (!isForwardOnly()) {
if (BEFORE_FIRST_ROW == currentRow)
moveFirst();
else
moveForward(1);
do {
if (BEFORE_FIRST_ROW == currentRow)
moveFirst();
else
moveForward(1);

// Only attempt rowDeleted() if result set is updatable.
try {
verifyResultSetIsUpdatable();
} catch (SQLServerException e) {
break;
}
} while (rowDeleted()); // repeat this if the row has been deleted beforehand, for scrollable & updatable resultsets.
boolean value = hasCurrentRow();
loggerExternal.exiting(getClassNameLogging(), "next", value);
return value;
Expand Down