Skip to content

Custom type handling #186

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
matthias-Q merged 3 commits into from
Jul 29, 2023
Merged

Custom type handling #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
742b68f
feat: add custom type handling
matthias-Q Jul 29, 2023
d6e2182
improve custom type parsing
matthias-Q Jul 29, 2023
395485e
use `_single_quote_string` for enum and alter types
matthias-Q Jul 29, 2023
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
140 changes: 132 additions & 8 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ module.exports = grammar({
keyword_into: _ => make_keyword("into"),
keyword_overwrite: _ => make_keyword("overwrite"),
keyword_values: _ => make_keyword("values"),
keyword_value: _ => make_keyword("value"),
keyword_matched: _ => make_keyword("matched"),
keyword_set: _ => make_keyword("set"),
keyword_from: _ => make_keyword("from"),
Expand Down Expand Up @@ -161,6 +162,7 @@ module.exports = grammar({
keyword_nulls: _ => make_keyword("nulls"),
keyword_first: _ => make_keyword("first"),
keyword_after: _ => make_keyword("after"),
keyword_before: _ => make_keyword("before"),
keyword_last: _ => make_keyword("last"),
keyword_window: _ => make_keyword("window"),
keyword_range: _ => make_keyword("range"),
Expand Down Expand Up @@ -206,7 +208,7 @@ module.exports = grammar({
keyword_vacuum: _ => make_keyword("vacuum"),
keyword_wait: _ => make_keyword("wait"),
keyword_nowait: _ => make_keyword("nowait"),

keyword_attribute: _ => make_keyword("attribute"),

keyword_trigger: _ => make_keyword('trigger'),
keyword_function: _ => make_keyword("function"),
Expand Down Expand Up @@ -440,6 +442,8 @@ module.exports = grammar({
$.keyword_regnamespace,
$.keyword_regproc,
$.keyword_regtype,

field("custom_type", $._identifier)
),
optional($.array_size_definition)
),
Expand Down Expand Up @@ -715,6 +719,7 @@ module.exports = grammar({
$.create_materialized_view,
$.create_index,
$.create_function,
$.create_type,
// TODO sequence
),
),
Expand Down Expand Up @@ -1051,10 +1056,54 @@ module.exports = grammar({
),
),

create_type: $ => seq(
$.keyword_create,
$.keyword_type,
$.identifier,
optional(
seq(
choice(
seq(
$.keyword_as,
$.column_definitions,
optional(seq($.keyword_collate, $.identifier))
),
seq(
$.keyword_as,
$.keyword_enum,
paren_list(field("enum_element", alias($._literal_string, $.literal)),
),
Comment thread
matthias-Q marked this conversation as resolved.
Outdated
),
seq(
$.keyword_as,
$.keyword_range,
Comment thread
matthias-Q marked this conversation as resolved.
Outdated
paren_list(
seq(
field('name', $.identifier),
'=',
field('value', choice($.identifier,alias($._literal_string, $.literal))),
),
),
),
seq(
paren_list(
seq(
field('name', $.identifier),
'=',
field('value', choice($.identifier,alias($._literal_string, $.literal))),
),
),
),
),
),
),
),

_alter_statement: $ => seq(
choice(
$.alter_table,
$.alter_view,
$.alter_type,
),
),

Expand Down Expand Up @@ -1241,11 +1290,79 @@ module.exports = grammar({
),
),

alter_type: $ => seq(
$.keyword_alter,
$.keyword_type,
$.identifier,
choice(
$.change_ownership,
$.set_schema,
$.rename_object,
seq(
$.keyword_rename,
$.keyword_attribute,
$.identifier,
$.keyword_to,
$.identifier,
optional($._cascade_restrict)
),
seq(
$.keyword_add,
$.keyword_value,
optional($._if_not_exists),
$.identifier,
Comment thread
matthias-Q marked this conversation as resolved.
Outdated
optional(
seq(
choice($.keyword_before, $.keyword_after),
$.identifier
Comment thread
matthias-Q marked this conversation as resolved.
Outdated
)
),
),
seq(
$.keyword_rename,
$.keyword_value,
$.identifier,
$.keyword_to,
$.identifier,
Comment thread
matthias-Q marked this conversation as resolved.
Outdated
),
seq(
choice(
seq(
$.keyword_add,
$.keyword_attribute,
$.identifier,
$._type
),
seq($.keyword_drop,
$.keyword_attribute,
optional($._if_exists),
$.identifier),
seq(
$.keyword_alter,
$.keyword_attribute,
$.identifier,
optional(seq($.keyword_set, $.keyword_data)),
$.keyword_type,
$._type
),
),
optional(seq($.keyword_collate, $.identifier)),
optional($._cascade_restrict)
)
),
),

_cascade_restrict: $ => choice(
Comment thread
matthias-Q marked this conversation as resolved.
Outdated
$.keyword_cascade,
$.keyword_restrict,
),

_drop_statement: $ => seq(
choice(
$.drop_table,
$.drop_view,
$.drop_index,
$.drop_type,
),
),

Expand All @@ -1255,7 +1372,7 @@ module.exports = grammar({
optional($._if_exists),
$.object_reference,
optional(
$.keyword_cascade,
$._cascade_restrict
),
),

Expand All @@ -1265,7 +1382,17 @@ module.exports = grammar({
optional($._if_exists),
$.object_reference,
optional(
$.keyword_cascade,
$._cascade_restrict
),
),

drop_type: $ => seq(
$.keyword_drop,
$.keyword_type,
optional($._if_exists),
$.object_reference,
optional(
$._cascade_restrict
),
),

Expand All @@ -1276,10 +1403,7 @@ module.exports = grammar({
optional($._if_exists),
field("name", $.identifier),
optional(
choice(
$.keyword_cascade,
$.keyword_restrict,
),
$._cascade_restrict
),
optional(
seq(
Expand Down Expand Up @@ -1874,7 +1998,7 @@ module.exports = grammar({
_qualified_field: $ => seq(
optional(
seq(
$.object_reference,
optional_parenthesis($.object_reference),
'.',
),
),
Expand Down
3 changes: 3 additions & 0 deletions queries/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@
(keyword_overwrite)
(keyword_matched)
(keyword_values)
(keyword_value)
(keyword_attribute)
(keyword_set)
(keyword_left)
(keyword_right)
Expand Down Expand Up @@ -182,6 +184,7 @@
(keyword_change)
(keyword_modify)
(keyword_after)
(keyword_before)
(keyword_range)
(keyword_rows)
(keyword_groups)
Expand Down
Loading