Skip to content
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

Jump to bottom

Added cleanup task to start of every execute. #2272

Merged
merged 10 commits into from
Jan 17, 2024
Merged

Added cleanup task to start of every execute. #2272

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fbc057f
Initial commit. Add the cleanup task to any execute task to clean up …
Jeffery-Wasty Dec 11, 2023
bbe91e3
Remove added lines in test file
Jeffery-Wasty Dec 11, 2023
ad684c9
Remove added imports
Jeffery-Wasty Dec 11, 2023
13a6590
Quick test fix try
Jeffery-Wasty Jan 2, 2024
26faa2b
Line should be removed, not just commented out.
Jeffery-Wasty Jan 3, 2024
3838468
Added missing execute cases
Jeffery-Wasty Jan 3, 2024
845e7f9
Discarded count should always be 1
Jeffery-Wasty Jan 5, 2024
d5be738
Mistake revert
Jeffery-Wasty Jan 5, 2024
5a24960
Another try
Jeffery-Wasty Jan 5, 2024
9568e96
Reverted test changes to try to get some consistency
Jeffery-Wasty Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ public java.sql.ResultSet executeQuery() throws SQLServerException, SQLTimeoutEx
loggerExternal.finer(toString() + ACTIVITY_ID + ActivityCorrelator.getCurrent().toString());
}
checkClosed();
connection.unprepareUnreferencedPreparedStatementHandles(false);
executeStatement(new PrepStmtExecCmd(this, EXECUTE_QUERY));
loggerExternal.exiting(getClassNameLogging(), "executeQuery");
return resultSet;
Expand All @@ -501,6 +502,7 @@ public java.sql.ResultSet executeQuery() throws SQLServerException, SQLTimeoutEx
*/
final java.sql.ResultSet executeQueryInternal() throws SQLServerException, SQLTimeoutException {
checkClosed();
connection.unprepareUnreferencedPreparedStatementHandles(false);
executeStatement(new PrepStmtExecCmd(this, EXECUTE_QUERY_INTERNAL));
return resultSet;
}
Expand All @@ -513,7 +515,7 @@ public int executeUpdate() throws SQLServerException, SQLTimeoutException {
}

checkClosed();

connection.unprepareUnreferencedPreparedStatementHandles(false);
executeStatement(new PrepStmtExecCmd(this, EXECUTE_UPDATE));

// this shouldn't happen, caller probably meant to call executeLargeUpdate
Expand All @@ -534,6 +536,7 @@ public long executeLargeUpdate() throws SQLServerException, SQLTimeoutException
loggerExternal.finer(toString() + ACTIVITY_ID + ActivityCorrelator.getCurrent().toString());
}
checkClosed();
connection.unprepareUnreferencedPreparedStatementHandles(false);
executeStatement(new PrepStmtExecCmd(this, EXECUTE_UPDATE));
loggerExternal.exiting(getClassNameLogging(), "executeLargeUpdate", updateCount);
return updateCount;
Expand All @@ -546,6 +549,7 @@ public boolean execute() throws SQLServerException, SQLTimeoutException {
loggerExternal.finer(toString() + ACTIVITY_ID + ActivityCorrelator.getCurrent().toString());
}
checkClosed();
connection.unprepareUnreferencedPreparedStatementHandles(false);
executeStatement(new PrepStmtExecCmd(this, EXECUTE));
loggerExternal.exiting(getClassNameLogging(), "execute", null != resultSet);
return null != resultSet;
Expand Down Expand Up @@ -2199,6 +2203,7 @@ public int[] executeBatch() throws SQLServerException, BatchUpdateException, SQL
loggerExternal.finer(toString() + ACTIVITY_ID + ActivityCorrelator.getCurrent().toString());
}
checkClosed();
connection.unprepareUnreferencedPreparedStatementHandles(false);
Jeffery-Wasty marked this conversation as resolved.
Show resolved Hide resolved
discardLastExecutionResults();

try {
Expand Down Expand Up @@ -2382,6 +2387,7 @@ public long[] executeLargeBatch() throws SQLServerException, BatchUpdateExceptio
loggerExternal.finer(toString() + ACTIVITY_ID + ActivityCorrelator.getCurrent().toString());
}
checkClosed();
connection.unprepareUnreferencedPreparedStatementHandles(false);
discardLastExecutionResults();

try {
Expand Down