Skip to content

fix: support unquoted Unicode identifiers in ANSI and Postgres dialects #2282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benfdking wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: support unquoted Unicode identifiers in ANSI and Postgres dialects #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1788567
fix: support unquoted Unicode identifiers in ANSI and Postgres dialects
benfdking Feb 5, 2026
ce4af88
formatting
benfdking Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions crates/lib-dialects/src/ansi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,18 @@ pub fn raw_dialect() -> Dialect {
let pattern = reserved_keywords.iter().join("|");
let anti_template = format!("^({pattern})$");

RegexParser::new("[A-Z0-9_]*[A-Z][A-Z0-9_]*", SyntaxKind::NakedIdentifier)
.anti_template(&anti_template)
.to_matchable()
RegexParser::new(
"[\\p{L}\\p{N}_]*[\\p{L}][\\p{L}\\p{N}_]*",
SyntaxKind::NakedIdentifier,
)
.anti_template(&anti_template)
.to_matchable()
})
.into(),
),
(
"ParameterNameSegment".into(),
RegexParser::new(r#"\"?[A-Z][A-Z0-9_]*\"?"#, SyntaxKind::Parameter)
RegexParser::new(r#"\"?[\p{L}][\p{L}\p{N}_]*\"?"#, SyntaxKind::Parameter)
.to_matchable()
.into(),
),
Expand All @@ -383,7 +386,7 @@ pub fn raw_dialect() -> Dialect {
let anti_template = format!("^({})$", "NOT");

one_of(vec![
RegexParser::new("[A-Z_][A-Z0-9_]*", SyntaxKind::DataTypeIdentifier)
RegexParser::new("[\\p{L}_][\\p{L}\\p{N}_]*", SyntaxKind::DataTypeIdentifier)
.anti_template(&anti_template)
.to_matchable(),
Ref::new("SingleIdentifierGrammar")
Expand Down Expand Up @@ -5370,7 +5373,7 @@ fn lexer_matchers() -> Vec<Matcher> {
Matcher::string("end_curly_bracket", "}", SyntaxKind::EndCurlyBracket),
Matcher::string("colon", ":", SyntaxKind::Colon),
Matcher::string("semicolon", ";", SyntaxKind::Semicolon),
Matcher::regex("word", "[0-9a-zA-Z_]+", SyntaxKind::Word),
Matcher::regex("word", "[\\p{L}\\p{N}_]+", SyntaxKind::Word),
]
}

Expand Down
22 changes: 14 additions & 8 deletions crates/lib-dialects/src/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ pub fn raw_dialect() -> Dialect {
SyntaxKind::SingleQuote,
),
Matcher::regex("double_quote", r#"(?s)".+?""#, SyntaxKind::DoubleQuote),
Matcher::regex("word", r"[a-zA-Z_][0-9a-zA-Z_$]*", SyntaxKind::Word),
Matcher::regex("word", r"[\p{L}_][\p{L}\p{N}_$]*", SyntaxKind::Word),
]);

let keywords = postgres_keywords();
Expand Down Expand Up @@ -402,7 +402,7 @@ pub fn raw_dialect() -> Dialect {
let anti_template = format!("^({pattern})$");

RegexParser::new(
r"([A-Z_]+|[0-9]+[A-Z_$])[A-Z0-9_$]*",
r"([\p{L}_]+|[\p{N}]+[\p{L}_$])[\p{L}\p{N}_$]*",
SyntaxKind::NakedIdentifier,
)
.anti_template(&anti_template)
Expand All @@ -412,15 +412,21 @@ pub fn raw_dialect() -> Dialect {
),
(
"ParameterNameSegment".into(),
RegexParser::new(r#"[A-Z_][A-Z0-9_$]*|\"[^\"]*\""#, SyntaxKind::Parameter)
.to_matchable()
.into(),
RegexParser::new(
r#"[\p{L}_][\p{L}\p{N}_$]*|\"[^\"]*\""#,
SyntaxKind::Parameter,
)
.to_matchable()
.into(),
),
(
"FunctionNameIdentifierSegment".into(),
RegexParser::new(r"[A-Z_][A-Z0-9_$]*", SyntaxKind::FunctionNameIdentifier)
.to_matchable()
.into(),
RegexParser::new(
r"[\p{L}_][\p{L}\p{N}_$]*",
SyntaxKind::FunctionNameIdentifier,
)
.to_matchable()
.into(),
),
(
"FunctionContentsExpressionGrammar".into(),
Expand Down
7 changes: 7 additions & 0 deletions crates/lib-dialects/test/fixtures/dialects/ansi/sqruff/unicode_identifiers.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SELECT 日本語 FROM テーブル;

SELECT 表1.列1 FROM 表1;

SELECT café FROM naïve_table;

SELECT über, straße FROM données;
67 changes: 67 additions & 0 deletions crates/lib-dialects/test/fixtures/dialects/ansi/sqruff/unicode_identifiers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
file:
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: 日本語
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: テーブル
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: 表1
- dot: .
- naked_identifier: 列1
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: 表1
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: café
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: naïve_table
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: über
- comma: ','
- select_clause_element:
- column_reference:
- naked_identifier: straße
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: données
- statement_terminator: ;
7 changes: 7 additions & 0 deletions crates/lib-dialects/test/fixtures/dialects/duckdb/sqruff/unicode_identifiers.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SELECT 日本語 FROM テーブル;

SELECT 表1.列1 FROM 表1;

SELECT café FROM naïve_table;

SELECT über, straße FROM données;
67 changes: 67 additions & 0 deletions crates/lib-dialects/test/fixtures/dialects/duckdb/sqruff/unicode_identifiers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
file:
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: 日本語
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: テーブル
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: 表1
- dot: .
- naked_identifier: 列1
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: 表1
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: café
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: naïve_table
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: über
- comma: ','
- select_clause_element:
- column_reference:
- naked_identifier: straße
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: données
- statement_terminator: ;
7 changes: 7 additions & 0 deletions crates/lib-dialects/test/fixtures/dialects/postgres/sqruff/unicode_identifiers.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SELECT 日本語 FROM テーブル;

SELECT 表1.列1 FROM 表1;

SELECT café FROM naïve_table;

SELECT über, straße FROM données;
67 changes: 67 additions & 0 deletions crates/lib-dialects/test/fixtures/dialects/postgres/sqruff/unicode_identifiers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
file:
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: 日本語
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: テーブル
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: 表1
- dot: .
- naked_identifier: 列1
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: 表1
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: café
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: naïve_table
- statement_terminator: ;
- statement:
- select_statement:
- select_clause:
- keyword: SELECT
- select_clause_element:
- column_reference:
- naked_identifier: über
- comma: ','
- select_clause_element:
- column_reference:
- naked_identifier: straße
- from_clause:
- keyword: FROM
- from_expression:
- from_expression_element:
- table_expression:
- table_reference:
- naked_identifier: données
- statement_terminator: ;
Loading