Add ODBC escape syntax support for time expressions #1953
+251
−110
Conversation
This file contains hidden or 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
iffyio
reviewed
Jul 21, 2025
There was a problem hiding this comment.
Thanks @etgarperets! The changes look good to me overall, left some minor comments
src/parser/mod.rs
Outdated
| @@ -2016,6 +2018,46 @@ impl<'a> Parser<'a> { | |||
| }) | |||
| } | |||
|
|
|||
| // Tries to parse the body of an [ODBC escaping sequence] | |||
There was a problem hiding this comment.
Suggested change
| // Tries to parse the body of an [ODBC escaping sequence] | |
| /// Tries to parse the body of an [ODBC escaping sequence] |
src/parser/mod.rs
Outdated
| @@ -2016,6 +2018,46 @@ impl<'a> Parser<'a> { | |||
| }) | |||
| } | |||
|
|
|||
| // Tries to parse the body of an [ODBC escaping sequence] | |||
There was a problem hiding this comment.
[ODBC escaping sequence]
Can we include a doc link referencing this part of the comment?
|
|
||
| #[test] | ||
| fn test_odbc_time_date_timestamp_support() { | ||
| let sql_d = "SELECT {d '2025-07-17'}, category_name FROM categories"; |
There was a problem hiding this comment.
Could we include a negative test for an expression that doesn't use the expected character? e.g. SELECT {tt '14:12:01'} FROM foo
iffyio
reviewed
Jul 21, 2025
src/ast/mod.rs
Outdated
Comment on lines
7425
to
7430
| true => match data_type { | ||
| DataType::Date => write!(f, "{{d {value}}}"), | ||
| DataType::Time(..) => write!(f, "{{t {value}}}"), | ||
| DataType::Timestamp(..) => write!(f, "{{ts {value}}}"), | ||
| _ => write!(f, "{{? {value}}}"), | ||
| }, |
There was a problem hiding this comment.
Suggested change
| true => match data_type { | |
| DataType::Date => write!(f, "{{d {value}}}"), | |
| DataType::Time(..) => write!(f, "{{t {value}}}"), | |
| DataType::Timestamp(..) => write!(f, "{{ts {value}}}"), | |
| _ => write!(f, "{{? {value}}}"), | |
| }, | |
| true => { | |
| let dt = match data_type { | |
| DataType::Date => "d", | |
| DataType::Time(..) => "t" | |
| DataType::Timestamp(..) => "ts", | |
| }; | |
| write!("{{ {dt} }}") | |
| }, |
I think this branch could be simplified to something like above?
iffyio
changed the title
etgarperets
force-pushed
the
“odbc-time-date-timestamp-support”
branch
from
8466a4e to
a0eb9c1
Compare
…timestamp literals. For this I modified TypedString by adding uses_odbc_syntax flag.
etgarperets
force-pushed
the
“odbc-time-date-timestamp-support”
branch
from
b988fbc to
3b08353
Compare
iffyio
reviewed
Jul 24, 2025
Comment on lines
+16327
to
+16332
| #[test] | ||
| #[should_panic] | ||
| fn test_invalid_odbc_literal_fails() { | ||
| let sql = "SELECT {tt '14:12:01'} FROM foo"; | ||
| let _ = all_dialects().verified_stmt(sql); | ||
| } |
There was a problem hiding this comment.
here's one example of how we do negative tests, can we rewrite to use that pattern instead of the should_panic macro? Also we can inline the scenario into the test_odbc_time_date_timestamp_support function since they belong to the same feature
| @@ -16289,6 +16314,23 @@ fn parse_notnull() { | |||
| notnull_unsupported_dialects.expr_parses_to("NOT NULL NOTNULL", "NOT NULL"); | |||
| } | |||
|
|
|||
| #[test] | |||
| fn test_odbc_time_date_timestamp_support() { | |||
There was a problem hiding this comment.
Suggested change
| fn test_odbc_time_date_timestamp_support() { | |
| fn parse_odbc_time_date_timestamp() { |
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.
…timestamp literals. For this I modified TypedString by adding uses_odbc_syntax flag.