Skip to content

Commit 3f610c1

Browse files
use more column identifiers
1 parent 7a205d1 commit 3f610c1

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

crates/pgt_treesitter_grammar/grammar.js

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,7 +1643,7 @@ module.exports = grammar({
16431643
$.keyword_insert,
16441644
seq(
16451645
$.keyword_update,
1646-
optional(seq($.keyword_of, comma_list($.any_identifier, true)))
1646+
optional(seq($.keyword_of, comma_list($.column_identifier, true)))
16471647
),
16481648
$.keyword_delete,
16491649
$.keyword_truncate
@@ -1781,7 +1781,7 @@ module.exports = grammar({
17811781
// TODO constraint management
17821782
$.keyword_alter,
17831783
optional($.keyword_column),
1784-
field("name", $.any_identifier),
1784+
$.column_identifier,
17851785
choice(
17861786
seq(
17871787
choice($.keyword_set, $.keyword_drop),
@@ -1833,30 +1833,27 @@ module.exports = grammar({
18331833
$.keyword_change,
18341834
optional($.keyword_column),
18351835
optional($._if_exists),
1836-
field("old_name", $.any_identifier),
1836+
$.column_identifier,
18371837
$.column_definition,
18381838
optional($.column_position)
18391839
),
18401840

18411841
column_position: ($) =>
1842-
choice(
1843-
$.keyword_first,
1844-
seq($.keyword_after, field("col_name", $.any_identifier))
1845-
),
1842+
choice($.keyword_first, seq($.keyword_after, $.column_identifier)),
18461843

18471844
drop_column: ($) =>
18481845
seq(
18491846
$.keyword_drop,
18501847
optional($.keyword_column),
18511848
optional($._if_exists),
1852-
field("name", $.any_identifier)
1849+
$.column_identifier
18531850
),
18541851

18551852
rename_column: ($) =>
18561853
seq(
18571854
$.keyword_rename,
18581855
optional($.keyword_column),
1859-
field("old_name", $.any_identifier),
1856+
$.column_identifier,
18601857
$.keyword_to,
18611858
field("new_name", $.any_identifier)
18621859
),
@@ -2558,6 +2555,7 @@ module.exports = grammar({
25582555
)
25592556
),
25602557

2558+
// todo(@juleswritescode): does this exist in postgresql?
25612559
table_sort: ($) =>
25622560
seq($.keyword_sort, $.keyword_by, paren_list($.any_identifier, true)),
25632561

@@ -2657,7 +2655,7 @@ module.exports = grammar({
26572655
seq(
26582656
$.keyword_references,
26592657
$.object_reference,
2660-
paren_list($.any_identifier, true),
2658+
paren_list($.column_identifier, true),
26612659
repeat(
26622660
seq(
26632661
$.keyword_on,
@@ -2669,6 +2667,7 @@ module.exports = grammar({
26692667
seq(
26702668
$.keyword_set,
26712669
choice($.keyword_null, $.keyword_default),
2670+
// todo(@juleswritescode): are these columns?
26722671
optional(paren_list($.any_identifier, true))
26732672
)
26742673
)
@@ -2762,6 +2761,7 @@ module.exports = grammar({
27622761
seq(
27632762
$.keyword_references,
27642763
$.object_reference,
2764+
// todo(@juleswritescode): are these columns?
27652765
paren_list($.any_identifier, true),
27662766
repeat(
27672767
seq(
@@ -2774,6 +2774,7 @@ module.exports = grammar({
27742774
seq(
27752775
$.keyword_set,
27762776
choice($.keyword_null, $.keyword_default),
2777+
// todo(@juleswritescode): are these columns?
27772778
optional(paren_list($.any_identifier, true))
27782779
)
27792780
)
@@ -3045,6 +3046,7 @@ module.exports = grammar({
30453046
seq(
30463047
$.keyword_as,
30473048
field("alias", $.any_identifier),
3049+
// todo(@juleswritescode): are these columns?
30483050
paren_list($.any_identifier, false)
30493051
)
30503052
)

0 commit comments

Comments
 (0)