refactor empty resultset to use empty result set if the catalog is not correct#3588
Merged
davecramer merged 8 commits intopgjdbc:masterfrom Apr 8, 2025
Merged
Conversation
Member
Author
Member
|
If we're not doing it other places and have no intention of adding this check everywhere, we should not be including it here either. |
Member
Author
|
works for me. I'll remove the checks |
9 tasks
vlsi
reviewed
Apr 13, 2025
| String sql; | ||
| sql = "SELECT current_database(), n.nspname,p.proname,p.prorettype,p.proargtypes, t.typtype,t.typrelid, " | ||
| // if the catalog is specified and it does not equal the current catalog then just return an empty resultset | ||
| if (catalog != null && !catalog.isEmpty() && !catalog.equals(connection.getCatalog())) { |
Member
There was a problem hiding this comment.
"" retrieves those without a catalog
I assume PostgreSQL does not have "procedures without a catalog", so catalog.isEmpty() check looks redundant here. WDYT of replacing this with catalog != null && (catalog.isEmpty() || !catalog.equals(connection.getCatalog()))
!Objects.equals(catalog, connection.getCatalog()) could do as well (at a cost of one-time SQL in getCatalog())
2 tasks
vlsi
added a commit
to vlsi/pgjdbc
that referenced
this pull request
Jun 14, 2025
…order 9th column should be KEY_SEQ, however it was 11 in case the resultset was empty This is a fix for pgjdbc#3588
vlsi
added a commit
that referenced
this pull request
Jun 14, 2025
…order 9th column should be KEY_SEQ, however it was 11 in case the resultset was empty This is a fix for #3588
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Alternative to #3528