Skip to content
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

Jump to bottom

Allow expr in generated always statement #194

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Allow expr in generated always statement #194

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
1695b30
fix: `generated always` should accept expressions
matthias-Q Sep 7, 2023
cde7200
fix: correct test condition
matthias-Q Sep 7, 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
37 changes: 21 additions & 16 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ module.exports = grammar({
// Hive Keywords
keyword_external: _ => make_keyword("external"),
keyword_stored: _ => make_keyword("stored"),
keyword_virtual: _ => make_keyword("virtual"),
keyword_cached: _ => make_keyword("cached"),
keyword_uncached: _ => make_keyword("uncached"),
keyword_replication: _ => make_keyword("replication"),
Expand Down Expand Up @@ -2190,22 +2191,26 @@ module.exports = grammar({
alias($._literal_string, $.literal)
),

_column_constraint: $ => choice(
choice(
$.keyword_null,
$._not_null,
),
$._default_expression,
$._primary_key,
$.keyword_auto_increment,
$.direction,
$._column_comment,
seq(
optional(seq($.keyword_generated, $.keyword_always)),
$.keyword_as,
$.identifier,
),
),
_column_constraint: $ => prec.left(choice(
choice(
$.keyword_null,
$._not_null,
),
$._default_expression,
$._primary_key,
$.keyword_auto_increment,
$.direction,
$._column_comment,
seq(
optional(seq($.keyword_generated, $.keyword_always)),
$.keyword_as,
$._expression,
),
choice(
$.keyword_stored,
$.keyword_virtual,
)
)),

_default_expression: $ => seq(
$.keyword_default,
Expand Down
1 change: 1 addition & 0 deletions queries/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
(keyword_uncached)
(keyword_lines)
(keyword_stored)
(keyword_virtual)
(keyword_partitioned)
(keyword_analyze)
(keyword_explain)
Expand Down
54 changes: 49 additions & 5 deletions test/corpus/create.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ CREATE TABLE type_test (
a_datetime DATETIME,
a_datetime2 DATETIME2,
a_datetimeoffset DATETIMEOFFSET,
a_smalldatetime SMALLDATE,
a_smalldatetime SMALLDATETIME,
a_time TIME,
a_timestamp TIMESTAMP,
a_verbose_timestamp TIMESTAMP WITHOUT TIME ZONE,
Expand Down Expand Up @@ -1034,7 +1034,8 @@ CREATE TABLE type_test (
type: (datetimeoffset
(keyword_datetimeoffset)))
(column_definition
name: (identifier))
name: (identifier)
type: (keyword_smalldatetime))
(column_definition
name: (identifier)
type: (time
Expand Down Expand Up @@ -1584,7 +1585,15 @@ Create table with generated always

CREATE TABLE "Role" (
"roleId" bigint generated always as identity,
"name" varchar NOT NULL
"name" varchar NOT NULL,
height_in numeric GENERATED ALWAYS AS (height_cm / 2.54) STORED,
item_type_name TEXT GENERATED ALWAYS AS (
CASE item_type
WHEN 1 THEN 'foo'
WHEN 2 THEN 'bar'
ELSE 'UNKNOWN'
END
) VIRTUAL
);

--------------------------------------------------------------------------------
Expand All @@ -1604,13 +1613,48 @@ CREATE TABLE "Role" (
(keyword_generated)
(keyword_always)
(keyword_as)
(identifier))
(field
name: (identifier)))
(column_definition
name: (literal)
type: (varchar
(keyword_varchar))
(keyword_not)
(keyword_null))))))
(keyword_null))
(column_definition
name: (identifier)
type: (numeric
(keyword_numeric))
(keyword_generated)
(keyword_always)
(keyword_as)
(binary_expression
left: (field
name: (identifier))
right: (literal))
(keyword_stored))
(column_definition
name: (identifier)
type: (keyword_text)
(keyword_generated)
(keyword_always)
(keyword_as)
(case
(keyword_case)
(field
name: (identifier))
(keyword_when)
(literal)
(keyword_then)
(literal)
(keyword_when)
(literal)
(keyword_then)
(literal)
(keyword_else)
(literal)
(keyword_end))
(keyword_virtual))))))

================================================================================
Inet type
Expand Down