Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion crates/squawk_parser/src/grammar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3714,7 +3714,9 @@ fn column(p: &mut Parser<'_>, kind: ColumnDefKind) -> CompletedMarker {
ColumnDefKind::NameRef => {
// https://www.depesz.com/2024/10/03/waiting-for-postgresql-18-add-temporal-foreign-key-contraints/
// TODO: add validation to ensure this is in the right position
p.eat(PERIOD_KW);
if p.at(PERIOD_KW) && p.nth_at_ts(1, NAME_REF_FIRST) {
p.bump(PERIOD_KW);
}
// supports parsing things like:
// INSERT INTO tictactoe (game, board[1:3][1:3])
name_ref(p).map(|lhs| postfix_expr(p, lhs, true));
Expand Down
10 changes: 10 additions & 0 deletions crates/squawk_parser/tests/data/ok/create_table.sql
Original file line number Diff line number Diff line change
Expand Up @@ -398,3 +398,13 @@ CREATE TABLE addresses (
recipient text NOT NULL,
PRIMARY KEY (id, valid_range WITHOUT OVERLAPS)
);

-- regression test gh issue #1171
-- allow period as a column name
CREATE TABLE t (
symbol text,
period text,
year int,
quarter int,
PRIMARY KEY (symbol, period, year, quarter)
);
91 changes: 91 additions & 0 deletions crates/squawk_parser/tests/snapshots/tests__create_table_ok.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3929,4 +3929,95 @@ SOURCE_FILE
WHITESPACE "\n"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n\n"
CREATE_TABLE
COMMENT "-- regression test gh issue #1171"
WHITESPACE "\n"
COMMENT "-- allow period as a column name"
WHITESPACE "\n"
CREATE_KW "CREATE"
WHITESPACE " "
TABLE_KW "TABLE"
WHITESPACE " "
PATH
PATH_SEGMENT
NAME
IDENT "t"
WHITESPACE " "
TABLE_ARG_LIST
L_PAREN "("
WHITESPACE "\n "
COLUMN
NAME
IDENT "symbol"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
TEXT_KW "text"
COMMA ","
WHITESPACE "\n "
COLUMN
NAME
PERIOD_KW "period"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
TEXT_KW "text"
COMMA ","
WHITESPACE "\n "
COLUMN
NAME
YEAR_KW "year"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
INT_KW "int"
COMMA ","
WHITESPACE "\n "
COLUMN
NAME
IDENT "quarter"
WHITESPACE " "
PATH_TYPE
PATH
PATH_SEGMENT
NAME_REF
INT_KW "int"
COMMA ","
WHITESPACE "\n "
PRIMARY_KEY_CONSTRAINT
PRIMARY_KW "PRIMARY"
WHITESPACE " "
KEY_KW "KEY"
WHITESPACE " "
COLUMN_LIST
L_PAREN "("
COLUMN
NAME_REF
IDENT "symbol"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
PERIOD_KW "period"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
YEAR_KW "year"
COMMA ","
WHITESPACE " "
COLUMN
NAME_REF
IDENT "quarter"
R_PAREN ")"
WHITESPACE "\n"
R_PAREN ")"
SEMICOLON ";"
WHITESPACE "\n"
Loading