Fix a corner case '=' not properly rewritten to AS #3405
Merged
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
added 2 commits
January 15, 2025 07:29
Previously we rewrite "SELECT COL=expr" to "SELECT expr as "COL"", but there's a corner case that for if condition, it didn't do the rewrite, because different parser path from if condition to dml statement. This commit fix this issue by adding the mutator logic to if statement rewrite. Task: BABEL-5320 Signed-off-by: Zhibai Song <[email protected]>
Pull Request Test Coverage Report for Build 12796200197Details
💛 - Coveralls |
xhfanhe
reviewed
Jan 15, 2025
xhfanhe
approved these changes
Jan 15, 2025
forestkeeper
merged commit 2634a7f
into
babelfish-for-postgresql:BABEL_5_X_DEV
46 checks passed
forestkeeper
added a commit
to amazon-aurora/babelfish_extensions
that referenced
this pull request
Jan 15, 2025
…tgresql#3405) Previously we rewrite "SELECT COL=expr" to "SELECT expr as "COL"", but there's a corner case that for if condition, it didn't do the rewrite, because different parser path from if condition to dml statement. This commit fix this issue by adding the mutator logic to if statement rewrite. Task: BABEL-5320 Signed-off-by: Zhibai Song <[email protected]>
Deepesh125
reviewed
Jan 16, 2025
test/JDBC/expected/BABEL-2514.out
Outdated
Comment on lines
201
to
205
| IF EXISTS | ||
| ( | ||
| SELECT tblnam = a.name FROM sysobjects a where a.name = 'tablename' | ||
| ) PRINT 'Exists'; ELSE PRINT 'Not Exists'; | ||
| GO |
There was a problem hiding this comment.
can you add test cases where we have similar statement inside procedure?
There was a problem hiding this comment.
Also, can you add tests where if condition itself gets re-written? For example,
IF EXISTS(
select trim(col) = '' from tab1 where ...
) PRINT 'Exists'; ELSE PRINT 'Not Exists';
Deepesh125
reviewed
Jan 16, 2025
| { | ||
| PLtsql_stmt_if *fragment = (PLtsql_stmt_if *) getPLtsql_fragment(ctx->parent->parent); | ||
| fragment->cond = makeTsqlExpr(ctx, false); | ||
| clear_rewritten_query_fragment(); |
There was a problem hiding this comment.
why are we calling clear_rewritten_query_fragment without calling add_rewritten_query_fragment_to_mutator?
| clear_rewritten_query_fragment(); | ||
|
|
||
| /* Now we can prepend SELECT to rewritten search_condition */ | ||
| expr->query = strdup((std::string("SELECT ") + std::string(expr->query)).c_str()); | ||
| return expr; | ||
| } | ||
|
|
||
| void enterSearch_condition(TSqlParser::Search_conditionContext *ctx) override | ||
| { | ||
| if (((TSqlParser::Cfl_statementContext *) ctx->parent->parent)->if_statement()) |
There was a problem hiding this comment.
Need Sanity check?
if (!ctx->parent || !ctx->parent->parent)
return;
There was a problem hiding this comment.
I think we should use dynamic_cast function instead of directly casting it
| clear_rewritten_query_fragment(); | ||
|
|
||
| /* Now we can prepend SELECT to rewritten search_condition */ | ||
| expr->query = strdup((std::string("SELECT ") + std::string(expr->query)).c_str()); | ||
| return expr; | ||
| } | ||
|
|
||
| void enterSearch_condition(TSqlParser::Search_conditionContext *ctx) override |
There was a problem hiding this comment.
Didnt get why we need this change?
| { | ||
| if (((TSqlParser::Cfl_statementContext *) ctx->parent->parent)->if_statement()) | ||
| { | ||
| PLtsql_stmt_if *fragment = (PLtsql_stmt_if *) getPLtsql_fragment(ctx->parent->parent); |
There was a problem hiding this comment.
Might be a naive question, I see there are multiple possible parent->parent of search_condition like
table_sources->table_source_item->search_condition
So are we saying that only in few conditions there will be parse tree path to if_condition which will always be parent->parent?
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 we rewrite "SELECT COL=expr" to "SELECT expr as "COL"", but there's a corner case that for if condition, it didn't do the rewrite, because different parser path from if condition to dml statement.
This commit fix this issue by adding the mutator logic to if statement rewrite.
Task: BABEL-5320
Signed-off-by: Zhibai Song [email protected]
Check List
By submitting this pull request, I confirm that my contribution is under the terms of the Apache 2.0 and PostgreSQL licenses, and grant any person obtaining a copy of the contribution permission to relicense all or a portion of my contribution to the PostgreSQL License solely to contribute all or a portion of my contribution to the PostgreSQL open source project.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.