Feat!: add support for heredoc strings (Postgres, ClickHouse) #2328
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
tobymao
reviewed
Sep 26, 2023
| @@ -248,11 +248,10 @@ class Postgres(Dialect): | |||
| } | |||
|
|
|||
| class Tokenizer(tokens.Tokenizer): | |||
| QUOTES = ["'", "$$"] | |||
There was a problem hiding this comment.
more like partially correct; it didn't take into account tagged heredocs like the following:
georgesittas=# select $foo$this is a string$foo$;
?column?
------------------
this is a string
(1 row)
There was a problem hiding this comment.
FYI the relevant commit is https://github.com/tobymao/sqlglot/pull/617/files, cc @mpf82
georgesittas
commented
Sep 26, 2023
| @@ -207,7 +207,6 @@ def test_postgres(self): | |||
| self.validate_identity("SELECT ARRAY[1, 2, 3] @> ARRAY[1, 2]") | |||
| self.validate_identity("SELECT ARRAY[1, 2, 3] <@ ARRAY[1, 2]") | |||
| self.validate_identity("SELECT ARRAY[1, 2, 3] && ARRAY[1, 2]") | |||
| self.validate_identity("$x") | |||
There was a problem hiding this comment.
This is invalid postgres:
georgesittas=# select $x;
ERROR: syntax error at or near "$"
LINE 1: select $x;
georgesittas
commented
Sep 26, 2023
| @@ -226,7 +226,6 @@ def test_identity(self): | |||
| self.validate_identity("SELECT * FROM #x") | |||
| self.validate_identity("SELECT INTERVAL '5 day'") | |||
| self.validate_identity("foo$") | |||
| self.validate_identity("$foo") | |||
There was a problem hiding this comment.
This is invalid Redshift
tobymao
approved these changes
Sep 26, 2023
|
Yup, works fine for my use case. Thanks! |
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.
Fixes #2316 - planning to do another pass on this and double-check some changed tests etc.
cc: @pkit
References: