fix: ensure Connection.isValid() returns true even if prepared statements deallocate #3655
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ents deallocate
Previously, the code for .isValid() was using
executeWithFlags("", QueryExecutor.QUERY_EXECUTE_AS_SIMPLE)
However, the execution still went with extended query protocol since
QueryExecutorImpl#updateQueryMode trimmed the flag in preferQueryMode=extended (default) mode.
It does not feel right to trim the flag there since the intention
of the option was to "prefer" query mode unless specified explicitly.
The case is identified and tested in AutoRollbackTest: isValid should
return true after statements like DEALLOCATE, DISCARD, and so on.
See pgjdbc#3631
Fixes pgjdbc#3630
davecramer
reviewed
Jun 6, 2025
| @@ -318,8 +318,6 @@ private int updateQueryMode(int flags) { | |||
| switch (getPreferQueryMode()) { | |||
| case SIMPLE: | |||
| return flags | QUERY_EXECUTE_AS_SIMPLE; | |||
| case EXTENDED: | |||
| return flags & ~QUERY_EXECUTE_AS_SIMPLE; | |||
| default: | |||
There was a problem hiding this comment.
hmmm, how long has that been there ?
There was a problem hiding this comment.
It has been sitting there for almost 9 years since 232569c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the code for
.isValid()was usingexecuteWithFlags("", QueryExecutor.QUERY_EXECUTE_AS_SIMPLE)However, the execution still went with extended query protocol since
QueryExecutorImpl#updateQueryModetrimmed the flag inpreferQueryMode=extended(default) mode.It does not feel right to trim the flag there since the intention of the option was to "prefer" query mode unless specified explicitly.
The case is identified and tested in
AutoRollbackTest: isValid should return true after statements like DEALLOCATE,DISCARD, and so on.See #3631
Fixes #3630