Discard semicolon stripping in SQL hook #25855
Merged
+12
−17
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
kazanzhy
commented
Aug 21, 2022
| @@ -244,9 +240,7 @@ def split_sql_string(sql: str) -> List[str]: | |||
| :return: list of individual expressions | |||
| """ | |||
| splits = sqlparse.split(sqlparse.format(sql, strip_comments=True)) | |||
| statements: List[str] = list( | |||
| filter(None, [s.rstrip(';').strip() if s.endswith(';') else s.strip() for s in splits]) | |||
| ) | |||
There was a problem hiding this comment.
The sqlparse.split already has .strip:
return [str(stmt).strip() for stmt in stack.run(sql, encoding)]
There was a problem hiding this comment.
But this filtration is necessary I think:
splits = ["SELECT ...", None, ""]
list(filter(None, splits))
Out[3]: ['SELECT ...']
potiuk
approved these changes
Aug 21, 2022
eladkal
approved these changes
Aug 21, 2022
|
Fixing tests. There're some issues |
2 tasks
kazanzhy
commented
Aug 21, 2022
| (' SELECT * FROM table ; # comment;', ['SELECT * FROM table']), | ||
| ('SELECT * FROM table;;;;;', ['SELECT * FROM table']), | ||
| ('SELECT * FROM table;;# comment;;;', ['SELECT * FROM table']), | ||
| ('SELECT * FROM table;;# comment;; ;', ['SELECT * FROM table']), |
There was a problem hiding this comment.
Why did I remove these test cases?
In the previous PR, some functionality was added that tried to make SQL query clearer.
But also it caused a few bugs. I think I tried to do some jobs for a developer and it was a bad idea.
I think we could add some functionality like split_statements but the developer should decide either to use it or not. But with semicolon stripping it wasn't that.
|
Cool. Thanks!. A lot of learnings from the common.sql exercise :) |
DMilmont
pushed a commit
to DMilmont/airflow
that referenced
this pull request
Aug 22, 2022
25 tasks
13 tasks
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.
Motivation:
Some databases (at least Oracle) need mandatory
;at the end of the SQL query.Also, possibly semicolon stripping might affect T-SQL statements.
How to fix it?
strip_semicolonand set it toFalseby default in OracleI think the second solution is better because basically it returns previous behavior for the hook and does not add additional complexity.
closes: #25851