fix(spans): Parse quotes in MySQL #2846
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
|
Blocked on apache/datafusion-sqlparser-rs#1065. |
jjbayer
commented
Dec 19, 2023
Comment on lines
+628
to
+640
| scrub_sql_test_with_dialect!( | ||
| mysql_escape_quote, | ||
| "mysql", | ||
| r#"SELECT "Wayne's World""#, | ||
| "SELECT %s" | ||
| ); | ||
|
|
||
| scrub_sql_test_with_dialect!( | ||
| mysql_escape_double_quote, | ||
| "mysql", | ||
| r#"SELECT "{\"json\": \"yes\"}""#, | ||
| "SELECT %s" | ||
| ); |
There was a problem hiding this comment.
These tests would previously fail.
jjbayer
commented
Dec 19, 2023
Comment on lines
+432
to
+434
| fn dialect(&self) -> std::any::TypeId { | ||
| self.0.dialect() | ||
| } |
There was a problem hiding this comment.
This informs the parser to treat the current dialect the same as the wrapped dialect, for example MySQL.
olksdr
approved these changes
Dec 19, 2023
Dav1dde
approved these changes
Dec 19, 2023
iker-barriocanal
approved these changes
Dec 19, 2023
| @@ -429,6 +429,10 @@ impl DialectWithParameters { | |||
| } | |||
|
|
|||
| impl Dialect for DialectWithParameters { | |||
| fn dialect(&self) -> std::any::TypeId { | |||
There was a problem hiding this comment.
nit: should we #[inline]?
There was a problem hiding this comment.
Should we?
Note: The rustc compiler automatically inlines functions based on internal heuristics. Incorrectly inlining functions can make the program slower, so this attribute should be used with care.
jan-auer
added a commit
that referenced
this pull request
Dec 19, 2023
* master: (35 commits) fix(spans): Parse quotes in MySQL (#2846) ref(cardinality): Use a Lua script and in-memory cache for the cardinality limiter (#2849) fix(spans): Detect hex with fallback scrubber (#2868) release: 23.12.0 Revert "ci: Update upload-artifact and download-artifact actions" (#2866) Revert "build: Update axum and http" (#2863) feat(spans): Allow resource.img spans (#2855) build: Update axum and http (#2844) fix(build): Add additional dependencies to the release build (#2858) ci: Update upload-artifact and download-artifact actions (#2861) feat(spans): Parse timestamps from strings (#2857) fix(spans): Scrub integer file extensions (#2856) feat(spans): Remove unused transaction tag from resource metrics (#2853) ref(cardinality): Recover buckets on cardinality limiter failure (#2852) feat(server): Org rate limit per metric bucket (#2836) ref(spans): List metric tags explicitly (#2834) feat(spans): Resource response sizes as measurements (#2845) feat(crons): Add thresholds to monitor config payload (#2842) feat(spans): Allow ingestion of metrics summary on spans (#2823) ref(crons): Add documentation to CheckInMessageType (#2840) ...
jan-auer
added a commit
that referenced
this pull request
Dec 20, 2023
* master: feat(processor): Add a metric to track the time of all messages (#2877) build(py): Update to python 3.9 (#2876) fix(spans): Collapse constants in SQL select (#2867) fix(spans): Parse quotes in MySQL (#2846) ref(cardinality): Use a Lua script and in-memory cache for the cardinality limiter (#2849) fix(spans): Detect hex with fallback scrubber (#2868)
jjbayer
added a commit
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
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.
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.
Some of the dialect-specific parsing logic did not apply because we use a wrapped dialect
DialectWithParameters, which has the wrongtype_id().Until apache/datafusion-sqlparser-rs#1065 gets merged, use a fork of
sqlparserto makeDialectWithParametersbehave like the underlying dialect.ref: #2847