Replace type_id() by trait method to allow wrapping dialects#1065
Merged
alamb merged 2 commits intoapache:mainfrom Dec 19, 2023
jjbayer:wrapped-dialect
Merged
Replace type_id() by trait method to allow wrapping dialects#1065alamb merged 2 commits intoapache:mainfrom jjbayer:wrapped-dialect
type_id() by trait method to allow wrapping dialects#1065alamb merged 2 commits intoapache:mainfrom
jjbayer:wrapped-dialect
Conversation
jjbayer
commented
Dec 14, 2023
| let res1 = Parser::parse_sql(&MySqlDialect {}, statement); | ||
| let res2 = Parser::parse_sql(&WrappedDialect(MySqlDialect {}), statement); | ||
| assert!(res1.is_ok()); | ||
| assert_eq!(res1, res2); |
Contributor
Author
There was a problem hiding this comment.
Without overriding dialect(), this assertion fails with
Err(
TokenizerError(
"Unterminated string literal at Line: 1, Column 23",
),
)
This was referenced Dec 14, 2023
jjbayer
added a commit
to getsentry/relay
that referenced
this pull request
Dec 19, 2023
Some of the dialect-specific parsing logic did not apply because we use a wrapped dialect `DialectWithParameters`, which has the wrong `type_id()`. Until apache/datafusion-sqlparser-rs#1065 gets merged, use a fork of `sqlparser` to make `DialectWithParameters` behave like the underlying dialect.
7 tasks
alamb
approved these changes
Dec 19, 2023
Contributor
alamb
left a comment
There was a problem hiding this comment.
This makes sense to me -- thank you @jjbayer
Ideally it would be nicer to have trait functions like supports_create_view() that control the parsers behavior rather than checking for specific dialects, as you mention, but that is a much larger change
alamb
reviewed
Dec 19, 2023
|
|
||
| #[test] | ||
| fn parse_with_wrapped_dialect() { | ||
| /// Wrapper for a dialect. In a real-world example, this wrapper |
Contributor
There was a problem hiding this comment.
👨🍳 👌 -- very nice example of creating a test illustrating the use case
Pull Request Test Coverage Report for Build 7210682589Warning: This coverage report may be inaccurate.We've detected an issue with your CI configuration that might affect the accuracy of this pull request's coverage report.
💛 - Coveralls |
Contributor
Author
|
@alamb thank you for accepting this PR, much appreciated! |
jjbayer
added a commit
to getsentry/relay
that referenced
this pull request
Feb 6, 2024
The `sqlparser` lib has been on a fork since #2846. We can now go back to the official version because apache/datafusion-sqlparser-rs#1065 has been merged & released.
jjbayer
added a commit
to getsentry/relay
that referenced
this pull request
Feb 6, 2024
The `sqlparser` lib has been on a fork since #2846. We can now go back to the official version because apache/datafusion-sqlparser-rs#1065 has been merged & released.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Part of the dialect-specific behavior of the parser is defined in the methods of the
Dialecttrait, but other parts of the behavior depend on thedialect_of!macro, which in turn checks theAny::type_idof the current dialect.Because if this, it is currently not possible to define variation of a dialect that is treated as the base dialect (e.g. MySQL) by the parser.
Ideally, all dialect-specific behavior would be defined in the implementation of the
Dialecttrait. As a workaround, this PR solves the problem by introducing an overridable trait method that returns theTypeId.