Add ability for dialects to override prefix, infix, and statement parsing #581
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
Pull Request Test Coverage Report for Build 2889163360
💛 - Coveralls |
andygrove
changed the title
andygrove
commented
Aug 17, 2022
Comment on lines
-198
to
-204
| Keyword::REPLACE if dialect_of!(self is SQLiteDialect ) => { | ||
| self.prev_token(); | ||
| Ok(self.parse_insert()?) | ||
| } | ||
| Keyword::COMMENT if dialect_of!(self is PostgreSqlDialect) => { | ||
| Ok(self.parse_comment()?) | ||
| } |
There was a problem hiding this comment.
This dialect-specific code has now moved to the appropriate dialects.
alamb
approved these changes
Aug 18, 2022
There was a problem hiding this comment.
I think it looks like a great idea -- thank you @andygrove
I had a small comment on tests but otherwise 👍 🚀
src/parser.rs
Outdated
| let sql = "SELECT 1 + 2"; | ||
| let ast = Parser::parse_sql(&dialect, sql)?; | ||
| let query = &ast[0]; | ||
| assert_eq!("SELECT NULL + 2", &format!("{}", query)); |
src/parser.rs
Outdated
| @@ -4926,4 +4910,124 @@ mod tests { | |||
| assert_eq!(ast.to_string(), sql.to_string()); | |||
| }); | |||
| } | |||
|
|
|||
| #[test] | |||
| fn custom_prefix_parser() -> Result<(), ParserError> { | |||
There was a problem hiding this comment.
I recommend putting these tests into tests somewhere so that we can be sure everything needed is exposed publically.
Perhaps tests/sqlparser_custom_dialects.rs?
There was a problem hiding this comment.
Good idea. I have moved them.
24 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.
Closes #580
This change adds some new functions to
Dialect:The parser will invoke these methods to see if the dialect wants to override the parsing of these items; otherwise, it will parse them itself. This is a much cleaner way to add dialect-specific parsing, IMO and will allow us to start removing all the
if dialect_ofhacks from the main parser.I moved the Postgres parsing of comments and the SqlLite parsing of REPLACE into their respective dialects to demonstrate how this works.