Support for SpEL expressions containing table names in annotated queries #1863
Conversation
This file contains 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
schauder
added a commit
that referenced
this pull request
Aug 28, 2024
SpEL expressions in queries get processed in two steps: 1. First SpEL expressions outside parameters are detected and processed. This is done with a `StandardEvaluationContext` with the variables `tableName` and `qualifiedTableName` added. This step is introduced by this commit. 2. Parameters made up by SpEL expressions are processed as usual. Closes #1856 Originial pull request #1863
schauder
force-pushed
the
issue/1856-tablename-spel
branch
from
d0127fe
to
33786ab
Compare
schauder
added a commit
that referenced
this pull request
Aug 28, 2024
SpEL expressions in queries get processed in two steps: 1. First SpEL expressions outside parameters are detected and processed. This is done with a `StandardEvaluationContext` with the variables `tableName` and `qualifiedTableName` added. This step is introduced by this commit. 2. Parameters made up by SpEL expressions are processed as usual. Closes #1856 Originial pull request #1863
schauder
force-pushed
the
issue/1856-tablename-spel
branch
from
33786ab
to
21a5f74
Compare
mp911de
requested changes
Aug 30, 2024
| * @param queryPreprocessor must not be {@literal null}. | ||
| * @since 3.4 | ||
| */ | ||
| public StringBasedJdbcQuery(JdbcQueryMethod queryMethod, NamedParameterJdbcOperations operations, |
There was a problem hiding this comment.
With already the constructor being changed, I wonder what difference it makes handing in the processed query vs. a QueryPreprocessor that we're going to remove from the signature anyways.
| private final SqlIdentifier qualifiedTableName; | ||
| private final Dialect dialect; | ||
|
|
||
| public TableNameQueryPreprocessor(SqlIdentifier tableName, SqlIdentifier qualifiedTableName, Dialect dialect) { |
There was a problem hiding this comment.
Introducing concepts of QueryPreprocessing exposes this utility quite prominently. I wonder whether we can avoid repeating table name extraction across JDBC and R2DBC modules and I wonder whether we could have a RelationalQueryLookupStrategy. Looking at JdbcQueryLookupStrategy and R2dbcQueryLookupStrategy, these seem to have sufficient context already for that purpose.
There was a problem hiding this comment.
Done.
I kept the TableNameQueryPreprocessor since putting tons of String manipulation into RelationalQueryLookupStrategy directly feels wrong.
SpEL expressions in queries get processed in two steps: 1. First SpEL expressions outside parameters are detected and processed. This is done with a `StandardEvaluationContext` with the variables `tableName` and `qualifiedTableName` added. This step is introduced by this commit. 2. Parameters made up by SpEL expressions are processed as usual. Closes #1856 Originial pull request #1863
schauder
force-pushed
the
issue/1856-tablename-spel
branch
from
21a5f74
to
c563c2c
Compare
mp911de
pushed a commit
that referenced
this pull request
Sep 4, 2024
SpEL expressions in queries get processed in two steps: 1. First SpEL expressions outside parameters are detected and processed. This is done with a `StandardEvaluationContext` with the variables `tableName` and `qualifiedTableName` added. This step is introduced by this commit. 2. Parameters made up by SpEL expressions are processed as usual. Closes #1856 Original pull request #1863
|
That's merged and polished now. |
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.
Closes #1856