Conversation
PostgreSQL supports Unicode-escaped quoted identifiers (U&"...") in addition to Unicode string literals (U&'...'), and both accept an optional trailing UESCAPE '<char>' clause to override the default backslash escape character. Neither was previously supported by the parser. See https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS Co-authored-by: GitHub Copilot <copilot@github.com>
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2509 +/- ##
==========================================
+ Coverage 80.96% 80.97% +0.01%
==========================================
Files 42 42
Lines 33359 33417 +58
Branches 33359 33417 +58
==========================================
+ Hits 27009 27060 +51
- Misses 2790 2791 +1
- Partials 3560 3566 +6 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
LucaCappelletti94
requested changes
Sep 24, 2026
| chars: &mut State, | ||
| ) -> Result<String, TokenizerError> { | ||
| let error_loc = chars.location(); | ||
| let raw = self.tokenize_single_quoted_string(chars, '\'', false)?; |
Contributor
There was a problem hiding this comment.
You should collapse the doubled quotes when unescape is off
Suggested change
| let raw = self.tokenize_single_quoted_string(chars, '\'', false)?; | |
| let mut raw = self.tokenize_single_quoted_string(chars, '\'', false)?; | |
| if !self.unescape { | |
| raw = raw.replace("''", "'"); | |
| } |
| fn test_unicode_string_literal_uescape() { | ||
| // Custom escape character via UESCAPE, see the postgres docs example | ||
| pg_and_generic().expr_parses_to(r#"U&'d!0061t!+000061' UESCAPE '!'"#, "U&'data'"); | ||
| } |
Contributor
There was a problem hiding this comment.
Just a red test relative to the other note.
Suggested change
| } | |
| } | |
| #[test] | |
| fn test_unicode_string_literal_no_unescape() { | |
| TestedDialects::new_with_options( | |
| vec![Box::new(PostgreSqlDialect {})], | |
| sqlparser::parser::ParserOptions::new().with_unescape(false), | |
| ) | |
| .verified_expr("U&'a''b'"); | |
| } |
LucaCappelletti94
added
the
waiting on contributor
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.
Example
Before this PR, none of these valid Postgres queries parsed:
U&"..."Unicode-escaped quoted identifiers were not tokenized at all (only theU&'...'string literal form was supported), and theUESCAPE '<char>'clause that can follow either aU&'...'string or aU&"..."identifier to override the default\escape character was not implemented, even though theUESCAPEkeyword already existed inkeywords.rs.Fix
U&"..."identifiers now tokenize into a regular quoted identifier (decoded, e.g.U&"d\0061ta"->"data"), and bothU&'...'andU&"..."now support an optional trailingUESCAPE '<char>'clause.See the Postgres docs (identifiers) and UESCAPE docs (escape clause). Relates to #1354, which added the
U&'...'string literal support this PR extends.This PR was authored with the assistance of GitHub Copilot.