Skip to content

parser: fix more pg test suite errors part 7 #527

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

Merged
kodiakhq merged 1 commit into from
Jun 3, 2025
Merged

parser: fix more pg test suite errors part 7 #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions crates/squawk_parser/src/generated/syntax_kind.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,18 @@ fn postfix_expr(
lhs = m.complete(p, POSTFIX_EXPR);
break;
}
IS_KW if p.at(IS_NOT_NORMALIZED)=> {
let m = lhs.precede(p);
p.bump(IS_NOT_NORMALIZED);
lhs = m.complete(p, POSTFIX_EXPR);
break;
}
IS_KW if p.at(IS_NORMALIZED)=> {
let m = lhs.precede(p);
p.bump(IS_NORMALIZED);
lhs = m.complete(p, POSTFIX_EXPR);
break;
}
NOTNULL_KW => {
let m = lhs.precede(p);
p.bump(NOTNULL_KW);
Expand Down Expand Up @@ -2092,6 +2104,10 @@ fn current_op(p: &Parser<'_>, r: &Restrictions) -> (u8, SyntaxKind, Associativit
NOT_KW if !r.not_disabled && p.at(NOT_ILIKE) => (6, NOT_ILIKE, Left),
// not in
NOT_KW if !r.not_disabled && p.at(NOT_IN) => (6, NOT_IN, Left),
// is normalized
IS_KW if !r.is_disabled && p.at(IS_NORMALIZED) => NOT_AN_OP,
// is not normalized
IS_KW if !r.is_disabled && p.at(IS_NOT_NORMALIZED) => NOT_AN_OP,
// is distinct from
IS_KW if !r.is_disabled && p.at(IS_DISTINCT_FROM) => (4, IS_DISTINCT_FROM, Left),
// is not distinct from
Expand Down Expand Up @@ -2765,6 +2781,12 @@ fn data_source(p: &mut Parser<'_>) {
opt_alias(p);
}
IDENT => from_item_name(p),
CAST_KW | TREAT_KW => {
if expr(p).is_none() {
p.error("expected expression");
}
opt_alias(p);
}
_ if p.at_ts(FROM_ITEM_KEYWORDS_FIRST) => from_item_name(p),
_ => {}
}
Expand Down
79 changes: 79 additions & 0 deletions crates/squawk_parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,39 @@ impl<'t> Parser<'t> {
m.complete(self, SyntaxKind::AT_TIME_ZONE);
return true;
}
SyntaxKind::IS_NOT_NORMALIZED => {
let m = self.start();
self.bump(SyntaxKind::IS_KW);
self.bump(SyntaxKind::NOT_KW);
if matches!(
self.current(),
SyntaxKind::NFC_KW
| SyntaxKind::NFD_KW
| SyntaxKind::NFKC_KW
| SyntaxKind::NFKD_KW
) {
self.bump_any();
}
self.bump(SyntaxKind::NORMALIZED_KW);
m.complete(self, SyntaxKind::IS_NOT_NORMALIZED);
return true;
}
SyntaxKind::IS_NORMALIZED => {
let m = self.start();
self.bump(SyntaxKind::IS_KW);
if matches!(
self.current(),
SyntaxKind::NFC_KW
| SyntaxKind::NFD_KW
| SyntaxKind::NFKC_KW
| SyntaxKind::NFKD_KW
) {
self.bump_any();
}
self.bump(SyntaxKind::NORMALIZED_KW);
m.complete(self, SyntaxKind::IS_NORMALIZED);
return true;
}
SyntaxKind::IS_NOT_DISTINCT_FROM => {
let m = self.start();
self.bump(SyntaxKind::IS_KW);
Expand Down Expand Up @@ -564,6 +597,52 @@ impl<'t> Parser<'t> {
SyntaxKind::DISTINCT_KW,
SyntaxKind::FROM_KW,
),
// is normalized
SyntaxKind::IS_NORMALIZED => {
if self.at(SyntaxKind::IS_KW) {
if matches!(
self.nth(1),
SyntaxKind::NFC_KW
| SyntaxKind::NFD_KW
| SyntaxKind::NFKC_KW
| SyntaxKind::NFKD_KW
) {
if self.nth_at(2, SyntaxKind::NORMALIZED_KW) {
return true;
}
} else {
if self.nth_at(1, SyntaxKind::NORMALIZED_KW) {
return true;
}
}
}
return false;
}
// is not normalized
SyntaxKind::IS_NOT_NORMALIZED => {
if self.at(SyntaxKind::IS_KW) && self.nth_at(1, SyntaxKind::NOT_KW) {
if matches!(
self.nth(2),
SyntaxKind::NFC_KW
| SyntaxKind::NFD_KW
| SyntaxKind::NFKC_KW
| SyntaxKind::NFKD_KW
) {
if self.nth_at(3, SyntaxKind::NOT_KW)
&& self.nth_at(4, SyntaxKind::NORMALIZED_KW)
{
return true;
}
} else {
if self.nth_at(2, SyntaxKind::NOT_KW)
&& self.nth_at(3, SyntaxKind::NORMALIZED_KW)
{
return true;
}
}
}
return false;
}
// similar to
SyntaxKind::SIMILAR_TO => self.at_composite2(
n,
Expand Down
24 changes: 0 additions & 24 deletions crates/squawk_parser/tests/snapshots/tests__regression_create_view.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,6 @@
source: crates/squawk_parser/tests/tests.rs
input_file: crates/squawk_parser/tests/data/regression_suite/create_view.sql
---
ERROR@21471: expected name
ERROR@21471: expected SEMICOLON
ERROR@21471: expected command, found CAST_KW
ERROR@21475: expected command, found L_PAREN
ERROR@21476: expected command, found INT_NUMBER
ERROR@21477: expected command, found PLUS
ERROR@21478: expected command, found INT_NUMBER
ERROR@21480: expected command, found AS_KW
ERROR@21483: expected command, found IDENT
ERROR@21487: expected command, found R_PAREN
ERROR@21489: expected command, found AS_KW
ERROR@21492: expected command, found IDENT
ERROR@21494: expected command, found COMMA
ERROR@21498: expected command, found CAST_KW
ERROR@21502: expected command, found L_PAREN
ERROR@21503: expected command, found INT_NUMBER
ERROR@21504: expected command, found PLUS
ERROR@21505: expected command, found INT_NUMBER
ERROR@21507: expected command, found AS_KW
ERROR@21510: expected command, found IDENT
ERROR@21514: expected command, found R_PAREN
ERROR@21516: expected command, found AS_KW
ERROR@21519: expected command, found IDENT
ERROR@21912: missing comma
ERROR@22280: expected R_PAREN
ERROR@22285: expected from item, got STRING
ERROR@22285: expected SEMICOLON
Expand Down
3 changes: 1 addition & 2 deletions crates/squawk_parser/tests/snapshots/tests__regression_suite_errors.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
source: crates/squawk_parser/tests/tests.rs
expression: "out.join(\"\\n\")"
---
tests/snapshots/tests__regression_create_view.snap:235
tests/snapshots/tests__regression_create_view.snap:211
tests/snapshots/tests__regression_errors.snap:286
tests/snapshots/tests__regression_foreign_data.snap:51
tests/snapshots/tests__regression_foreign_key.snap:24
Expand All @@ -29,7 +29,6 @@ tests/snapshots/tests__regression_transactions.snap:114
tests/snapshots/tests__regression_triggers.snap:51
tests/snapshots/tests__regression_tsearch.snap:62
tests/snapshots/tests__regression_tuplesort.snap:188
tests/snapshots/tests__regression_unicode.snap:40
tests/snapshots/tests__regression_union.snap:25
tests/snapshots/tests__regression_update.snap:29
tests/snapshots/tests__regression_vacuum.snap:21
Expand Down
44 changes: 0 additions & 44 deletions crates/squawk_parser/tests/snapshots/tests__regression_unicode.snap
View file
Open in desktop

This file was deleted.

60 changes: 28 additions & 32 deletions crates/squawk_parser/tests/snapshots/tests__select_operators_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1533,13 +1533,13 @@ SOURCE_FILE
WHITESPACE " "
TARGET_LIST
TARGET
BIN_EXPR
POSTFIX_EXPR
LITERAL
BYTE_STRING "U&'\\0061\\0308bc'"
WHITESPACE " "
IS_KW "is"
WHITESPACE " "
NAME_REF
IS_NORMALIZED
IS_KW "is"
WHITESPACE " "
NORMALIZED_KW "normalized"
SEMICOLON ";"
WHITESPACE "\n"
Expand All @@ -1549,17 +1549,16 @@ SOURCE_FILE
WHITESPACE " "
TARGET_LIST
TARGET
BIN_EXPR
POSTFIX_EXPR
LITERAL
BYTE_STRING "U&'\\0061\\0308bc'"
WHITESPACE " "
IS_KW "is"
WHITESPACE " "
NAME_REF
IS_NORMALIZED
IS_KW "is"
WHITESPACE " "
NFC_KW "nfc"
WHITESPACE " "
NAME
NORMALIZED_KW "normalized"
WHITESPACE " "
NORMALIZED_KW "normalized"
SEMICOLON ";"
WHITESPACE "\n"
SELECT
Expand All @@ -1568,17 +1567,16 @@ SOURCE_FILE
WHITESPACE " "
TARGET_LIST
TARGET
BIN_EXPR
POSTFIX_EXPR
LITERAL
BYTE_STRING "U&'\\0061\\0308bc'"
WHITESPACE " "
IS_KW "is"
WHITESPACE " "
NAME_REF
IS_NORMALIZED
IS_KW "is"
WHITESPACE " "
NFD_KW "nfd"
WHITESPACE " "
NAME
NORMALIZED_KW "normalized"
WHITESPACE " "
NORMALIZED_KW "normalized"
SEMICOLON ";"
WHITESPACE "\n"
SELECT
Expand All @@ -1587,17 +1585,16 @@ SOURCE_FILE
WHITESPACE " "
TARGET_LIST
TARGET
BIN_EXPR
POSTFIX_EXPR
LITERAL
BYTE_STRING "U&'\\0061\\0308bc'"
WHITESPACE " "
IS_KW "is"
WHITESPACE " "
NAME_REF
IS_NORMALIZED
IS_KW "is"
WHITESPACE " "
NFKC_KW "nfkc"
WHITESPACE " "
NAME
NORMALIZED_KW "normalized"
WHITESPACE " "
NORMALIZED_KW "normalized"
SEMICOLON ";"
WHITESPACE "\n"
SELECT
Expand All @@ -1606,17 +1603,16 @@ SOURCE_FILE
WHITESPACE " "
TARGET_LIST
TARGET
BIN_EXPR
POSTFIX_EXPR
LITERAL
BYTE_STRING "U&'\\0061\\0308bc'"
WHITESPACE " "
IS_KW "is"
WHITESPACE " "
NAME_REF
IS_NORMALIZED
IS_KW "is"
WHITESPACE " "
NFKD_KW "nfkd"
WHITESPACE " "
NAME
NORMALIZED_KW "normalized"
WHITESPACE " "
NORMALIZED_KW "normalized"
SEMICOLON ";"
WHITESPACE "\n"
SELECT
Expand Down
Loading
Loading