Skip to content

parser: normal ast node names #495

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
May 24, 2025
Merged

parser: normal ast node names #495

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
318 changes: 158 additions & 160 deletions crates/squawk_parser/src/generated/syntax_kind.rs
View file
Open in desktop

Large diffs are not rendered by default.

357 changes: 175 additions & 182 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions crates/squawk_parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,13 +541,6 @@ impl<'t> Parser<'t> {
SyntaxKind::NOT_KW,
TrivaBetween::Allowed,
),
// is null
SyntaxKind::IS_NULL => self.at_composite2(
n,
SyntaxKind::IS_KW,
SyntaxKind::NULL_KW,
TrivaBetween::Allowed,
),
// not like
SyntaxKind::NOT_LIKE => self.at_composite2(
n,
Expand Down
11 changes: 5 additions & 6 deletions crates/squawk_parser/tests/snapshots/tests__alter_collation_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
---
source: crates/squawk_parser/tests/tests.rs
input_file: crates/squawk_parser/tests/data/ok/alter_collation.sql
snapshot_kind: text
---
SOURCE_FILE
COMMENT "-- refresh"
WHITESPACE "\n"
ALTER_COLLATION_STMT
ALTER_COLLATION
ALTER_KW "alter"
WHITESPACE " "
COLLATION_KW "collation"
Expand All @@ -23,7 +22,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- rename"
WHITESPACE "\n"
ALTER_COLLATION_STMT
ALTER_COLLATION
ALTER_KW "alter"
WHITESPACE " "
COLLATION_KW "collation"
Expand All @@ -43,7 +42,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- owner"
WHITESPACE "\n"
ALTER_COLLATION_STMT
ALTER_COLLATION
ALTER_KW "alter"
WHITESPACE " "
COLLATION_KW "collation"
Expand All @@ -60,7 +59,7 @@ SOURCE_FILE
IDENT "u"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_COLLATION_STMT
ALTER_COLLATION
ALTER_KW "alter"
WHITESPACE " "
COLLATION_KW "collation"
Expand All @@ -84,7 +83,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- set_schema"
WHITESPACE "\n"
ALTER_COLLATION_STMT
ALTER_COLLATION
ALTER_KW "alter"
WHITESPACE " "
COLLATION_KW "collation"
Expand Down
11 changes: 5 additions & 6 deletions crates/squawk_parser/tests/snapshots/tests__alter_conversion_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
---
source: crates/squawk_parser/tests/tests.rs
input_file: crates/squawk_parser/tests/data/ok/alter_conversion.sql
snapshot_kind: text
---
SOURCE_FILE
COMMENT "-- rename"
WHITESPACE "\n"
ALTER_CONVERSION_STMT
ALTER_CONVERSION
ALTER_KW "alter"
WHITESPACE " "
CONVERSION_KW "conversion"
Expand All @@ -26,7 +25,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- owner"
WHITESPACE "\n"
ALTER_CONVERSION_STMT
ALTER_CONVERSION
ALTER_KW "alter"
WHITESPACE " "
CONVERSION_KW "conversion"
Expand All @@ -43,7 +42,7 @@ SOURCE_FILE
IDENT "u"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_CONVERSION_STMT
ALTER_CONVERSION
ALTER_KW "alter"
WHITESPACE " "
CONVERSION_KW "conversion"
Expand All @@ -62,7 +61,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- set_schema"
WHITESPACE "\n"
ALTER_CONVERSION_STMT
ALTER_CONVERSION
ALTER_KW "alter"
WHITESPACE " "
CONVERSION_KW "conversion"
Expand All @@ -82,7 +81,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- qualified_name"
WHITESPACE "\n"
ALTER_CONVERSION_STMT
ALTER_CONVERSION
ALTER_KW "alter"
WHITESPACE " "
CONVERSION_KW "conversion"
Expand Down
31 changes: 15 additions & 16 deletions crates/squawk_parser/tests/snapshots/tests__alter_database_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
---
source: crates/squawk_parser/tests/tests.rs
input_file: crates/squawk_parser/tests/data/ok/alter_database.sql
snapshot_kind: text
---
SOURCE_FILE
COMMENT "-- rename"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -24,7 +23,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- owner"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -39,7 +38,7 @@ SOURCE_FILE
IDENT "u"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -56,7 +55,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- tablespace"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -74,7 +73,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- refresh"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -91,7 +90,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- set_param"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -111,7 +110,7 @@ SOURCE_FILE
IDENT "v"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -131,7 +130,7 @@ SOURCE_FILE
IDENT "v"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -151,7 +150,7 @@ SOURCE_FILE
DEFAULT_KW "default"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -173,7 +172,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- reset"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -189,7 +188,7 @@ SOURCE_FILE
IDENT "p"
SEMICOLON ";"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -204,7 +203,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- with_option"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -222,7 +221,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- option_connection_limit"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -240,7 +239,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- option_is_template"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand All @@ -256,7 +255,7 @@ SOURCE_FILE
WHITESPACE "\n\n"
COMMENT "-- with_multiple_options"
WHITESPACE "\n"
ALTER_DATABASE_STMT
ALTER_DATABASE
ALTER_KW "alter"
WHITESPACE " "
DATABASE_KW "database"
Expand Down
Loading
Loading