Skip to content

parser: fix index option parsing #1188

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 2 commits into from
Jun 6, 2026
Merged

parser: fix index option parsing #1188

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
8fc0e6a
parser: fix index option parsing
sbdchd Jun 6, 2026
7a53695
Merge branch 'master' into steved-fix-index-option-parsing
kodiakhq[bot] Jun 6, 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
12 changes: 10 additions & 2 deletions crates/squawk_parser/src/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5146,7 +5146,7 @@ fn partition_item(p: &mut Parser<'_>, allow_extra_params: bool) -> CompletedMark
}
opt_collate(p);
// [ opclass ]
opt_ident(p);
opt_index_opclass(p);
if allow_extra_params {
// [ ( opclass_parameter = value [, ... ] ) ]
if p.at(L_PAREN) {
Expand All @@ -5165,6 +5165,14 @@ fn opt_partition_item(p: &mut Parser<'_>, allow_extra_params: bool) -> Option<Co
Some(partition_item(p, allow_extra_params))
}

fn opt_index_opclass(p: &mut Parser<'_>) {
// at nulls_order
if p.at(NULLS_KW) && (p.nth_at(1, FIRST_KW) || p.nth_at(1, LAST_KW)) {
return;
}
opt_path_name_ref(p);
}

// [ NULLS { FIRST | LAST } ]
fn opt_nulls_order(p: &mut Parser<'_>) {
let m = p.start();
Expand Down Expand Up @@ -13381,7 +13389,7 @@ fn opt_conflict_index_item(p: &mut Parser<'_>) -> bool {
}
opt_collate(p);
// [ opclass ]
opt_ident(p);
opt_index_opclass(p);
m.complete(p, CONFLICT_INDEX_ITEM);
true
}
Expand Down
5 changes: 5 additions & 0 deletions crates/squawk_parser/tests/data/ok/create_index.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,8 @@ CREATE INDEX pointloc

CREATE INDEX CONCURRENTLY sales_quantity_index ON sales_table (quantity);

create index idx on t using gin (c nulls first);
create index idx on t using gin (c nulls nulls first);

-- regression, see issue#1187
CREATE INDEX index_name ON public.table_name USING GIN (column_name public.gin__int_ops);
6 changes: 6 additions & 0 deletions crates/squawk_parser/tests/data/ok/insert.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH')
insert into t (a, b, c) values (1, 2, 3)
on conflict (a, b) do nothing;

insert into t (c) values (1)
on conflict (c public.gin__int_ops) do nothing;

insert into t (c) values (1)
on conflict (c nulls) do nothing;

-- Don't update existing distributors based in a certain ZIP code
INSERT INTO distributors AS d (did, dname) VALUES (8, 'Anvil Distribution')
ON CONFLICT (did) DO UPDATE
Expand Down
132 changes: 130 additions & 2 deletions crates/squawk_parser/tests/snapshots/tests__create_index_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ SOURCE_FILE
NAME_REF
IDENT "a"
WHITESPACE " "
IDENT "text_pattern_ops"
PATH
PATH_SEGMENT
NAME_REF
IDENT "text_pattern_ops"
WHITESPACE " "
ATTRIBUTE_LIST
L_PAREN "("
Expand Down Expand Up @@ -190,7 +193,10 @@ SOURCE_FILE
NAME_REF
IDENT "b"
WHITESPACE " "
IDENT "text_pattern_ops"
PATH
PATH_SEGMENT
NAME_REF
IDENT "text_pattern_ops"
WHITESPACE " "
ATTRIBUTE_LIST
L_PAREN "("
Expand Down Expand Up @@ -787,3 +793,125 @@ SOURCE_FILE
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
CREATE_INDEX
CREATE_KW "create"
WHITESPACE " "
INDEX_KW "index"
WHITESPACE " "
NAME
IDENT "idx"
WHITESPACE " "
ON_KW "on"
WHITESPACE " "
RELATION_NAME
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " "
USING_METHOD
USING_KW "using"
WHITESPACE " "
NAME_REF
IDENT "gin"
WHITESPACE " "
PARTITION_ITEM_LIST
L_PAREN "("
PARTITION_ITEM
NAME_REF
IDENT "c"
WHITESPACE " "
NULLS_FIRST
NULLS_KW "nulls"
WHITESPACE " "
FIRST_KW "first"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n"
CREATE_INDEX
CREATE_KW "create"
WHITESPACE " "
INDEX_KW "index"
WHITESPACE " "
NAME
IDENT "idx"
WHITESPACE " "
ON_KW "on"
WHITESPACE " "
RELATION_NAME
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " "
USING_METHOD
USING_KW "using"
WHITESPACE " "
NAME_REF
IDENT "gin"
WHITESPACE " "
PARTITION_ITEM_LIST
L_PAREN "("
PARTITION_ITEM
NAME_REF
IDENT "c"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
NULLS_KW "nulls"
WHITESPACE " "
NULLS_FIRST
NULLS_KW "nulls"
WHITESPACE " "
FIRST_KW "first"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- regression, see issue#1187"
WHITESPACE "\n"
CREATE_INDEX
CREATE_KW "CREATE"
WHITESPACE " "
INDEX_KW "INDEX"
WHITESPACE " "
NAME
IDENT "index_name"
WHITESPACE " "
ON_KW "ON"
WHITESPACE " "
RELATION_NAME
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "public"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "table_name"
WHITESPACE " "
USING_METHOD
USING_KW "USING"
WHITESPACE " "
NAME_REF
IDENT "GIN"
WHITESPACE " "
PARTITION_ITEM_LIST
L_PAREN "("
PARTITION_ITEM
NAME_REF
IDENT "column_name"
WHITESPACE " "
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "public"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "gin__int_ops"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n"
5 changes: 4 additions & 1 deletion crates/squawk_parser/tests/snapshots/tests__create_table_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,10 @@ SOURCE_FILE
NAME_REF
IDENT "\"fr_FR\""
WHITESPACE " "
IDENT "text_pattern_ops"
PATH
PATH_SEGMENT
NAME_REF
IDENT "text_pattern_ops"
COMMA ","
WHITESPACE " \n "
PARTITION_ITEM
Expand Down
107 changes: 107 additions & 0 deletions crates/squawk_parser/tests/snapshots/tests__insert_ok.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,113 @@ SOURCE_FILE
NOTHING_KW "nothing"
SEMICOLON ";"
WHITESPACE "\n\n"
INSERT
INSERT_KW "insert"
WHITESPACE " "
INTO_KW "into"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " "
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "c"
R_PAREN ")"
WHITESPACE " "
VALUES
VALUES_KW "values"
WHITESPACE " "
ROW_LIST
ROW
L_PAREN "("
LITERAL
INT_NUMBER "1"
R_PAREN ")"
WHITESPACE "\n "
ON_CONFLICT_CLAUSE
ON_KW "on"
WHITESPACE " "
CONFLICT_KW "conflict"
WHITESPACE " "
CONFLICT_ON_INDEX
CONFLICT_INDEX_ITEM_LIST
L_PAREN "("
CONFLICT_INDEX_ITEM
NAME_REF
IDENT "c"
WHITESPACE " "
PATH
PATH
PATH_SEGMENT
NAME_REF
IDENT "public"
DOT "."
PATH_SEGMENT
NAME_REF
IDENT "gin__int_ops"
R_PAREN ")"
WHITESPACE " "
CONFLICT_DO_NOTHING
DO_KW "do"
WHITESPACE " "
NOTHING_KW "nothing"
SEMICOLON ";"
WHITESPACE "\n\n"
INSERT
INSERT_KW "insert"
WHITESPACE " "
INTO_KW "into"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
IDENT "t"
WHITESPACE " "
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "c"
R_PAREN ")"
WHITESPACE " "
VALUES
VALUES_KW "values"
WHITESPACE " "
ROW_LIST
ROW
L_PAREN "("
LITERAL
INT_NUMBER "1"
R_PAREN ")"
WHITESPACE "\n "
ON_CONFLICT_CLAUSE
ON_KW "on"
WHITESPACE " "
CONFLICT_KW "conflict"
WHITESPACE " "
CONFLICT_ON_INDEX
CONFLICT_INDEX_ITEM_LIST
L_PAREN "("
CONFLICT_INDEX_ITEM
NAME_REF
IDENT "c"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME_REF
NULLS_KW "nulls"
R_PAREN ")"
WHITESPACE " "
CONFLICT_DO_NOTHING
DO_KW "do"
WHITESPACE " "
NOTHING_KW "nothing"
SEMICOLON ";"
WHITESPACE "\n\n"
COMMENT "-- Don't update existing distributors based in a certain ZIP code"
WHITESPACE "\n"
INSERT
Expand Down
32 changes: 30 additions & 2 deletions crates/squawk_syntax/src/ast/generated/nodes.rs
View file
Open in desktop

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

Loading
Loading