SQLite: Allow dollar signs in placeholder names #1620
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
Relevant: apache#1402 SQLite version 3.43.2 2023-10-10 13:08:14 Enter ".help" for usage hints. Connected to a transient in-memory database. Use ".open FILENAME" to reopen on a persistent database. sqlite> .mode box sqlite> .nullvalue NULL sqlite> SELECT $$, $$ABC$$, $ABC$, $ABC; ┌──────┬─────────┬───────┬──────┐ │ $$ │ $$ABC$$ │ $ABC$ │ $ABC │ ├──────┼─────────┼───────┼──────┤ │ NULL │ NULL │ NULL │ NULL │ └──────┴─────────┴───────┴──────┘
hansott
changed the title
hansott
changed the title
goldmedal
reviewed
Dec 27, 2024
src/dialect/mod.rs
Outdated
| @@ -636,6 +636,10 @@ pub trait Dialect: Debug + Any { | |||
| false | |||
| } | |||
|
|
|||
| fn supports_dollar_quoted_string(&self) -> bool { | |||
There was a problem hiding this comment.
It's better to add some documents for this method. (Just like others).
iffyio
reviewed
Dec 27, 2024
src/tokenizer.rs
Outdated
Comment on lines
1526
to
1528
| // Check if the second character is a dollar sign | ||
| let next_is_dollar = matches!(chars.peek(), Some('$')); | ||
| if next_is_dollar && self.dialect.supports_dollar_quoted_string() { |
There was a problem hiding this comment.
Suggested change
| // Check if the second character is a dollar sign | |
| let next_is_dollar = matches!(chars.peek(), Some('$')); | |
| if next_is_dollar && self.dialect.supports_dollar_quoted_string() { | |
| // If the dialect does not support dollar-quoted string, then `$$` is rather a placeholder. | |
| if matches!(chars.peek(), Some('$')) && self.dialect.supports_dollar_quoted_string() { |
if that makes sense, figured we could mention in the comment what the condition implies?
src/tokenizer.rs
Outdated
Comment on lines
1567
to
1568
| let next_is_dollar = matches!(chars.peek(), Some('$')); | ||
| if next_is_dollar && self.dialect.supports_dollar_quoted_string() { |
There was a problem hiding this comment.
Suggested change
| let next_is_dollar = matches!(chars.peek(), Some('$')); | |
| if next_is_dollar && self.dialect.supports_dollar_quoted_string() { | |
| if matches!(chars.peek(), Some('$')) && self.dialect.supports_dollar_quoted_string() { |
src/tokenizer.rs
Outdated
| @@ -2604,6 +2609,30 @@ mod tests { | |||
| ); | |||
| } | |||
|
|
|||
| #[test] | |||
| fn tokenize_dollar_placeholder_sqlite() { | |||
There was a problem hiding this comment.
Suggested change
| fn tokenize_dollar_placeholder_sqlite() { | |
| fn tokenize_dollar_placeholder() { |
src/dialect/mod.rs
Outdated
| @@ -636,6 +636,12 @@ pub trait Dialect: Debug + Any { | |||
| false | |||
| } | |||
|
|
|||
| /// Returns true if this dialect allows dollar quoted strings | |||
| /// e.g. `SELECT $$Hello, world!$$` or `SELECT $tag$Hello, world!$tag$` | |||
| fn supports_dollar_quoted_string(&self) -> bool { | |||
There was a problem hiding this comment.
I wondering would it make more sense to flip the condition to e.g. supports_dollar_placeholder(), setting that to true for sqlite and default false for the others? Thinking that might be the more conservative change of the two given that its the placeholder behavior that is more subtle/specific, (most of the other dialects technically don't support dollar quoted string so its less misleading if they don't have to explicitly flag otherwise)
iffyio
changed the title
|
@iffyio Addressed all your comments, great feedback 🥇 |
iffyio
approved these changes
Dec 28, 2024
hansott
added a commit
to AikidoSec/datafusion-sqlparser-rs
that referenced
this pull request
Dec 28, 2024
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.
Relevant: #1402
Not sure if this is the best way to fix, open for feedback.