Skip to content

Commit 58f6b11

Browse files
committed
feat: commit 7081ac46ace8c459966174400b53418683c9fe5c
1 parent a1a7a4d commit 58f6b11

9 files changed

Lines changed: 18732 additions & 17763 deletions

postgresql/PostgreSQLLexer.g4

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2788,6 +2788,14 @@ CASE_INSENSITIVE
27882788
: 'CASE_INSENSITIVE'
27892789
;
27902790

2791+
JSON_ARRAYAGG
2792+
: 'JSON_ARRAYAGG'
2793+
;
2794+
2795+
JSON_OBJECTAGG
2796+
: 'JSON_OBJECTAGG'
2797+
;
2798+
27912799
Identifier
27922800
: IdentifierStartChar IdentifierChar*
27932801
;

postgresql/PostgreSQLParser.g4

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3558,12 +3558,27 @@ func_application
35583558

35593559
func_expr
35603560
: func_application within_group_clause? filter_clause? over_clause?
3561+
| json_aggregate_func filter_clause over_clause
35613562
| func_expr_common_subexpr
35623563
;
35633564

35643565
func_expr_windowless
35653566
: func_application
35663567
| func_expr_common_subexpr
3568+
| json_aggregate_func
3569+
;
3570+
3571+
json_aggregate_func
3572+
: JSON_OBJECTAGG OPEN_PAREN json_name_and_value json_object_constructor_null_clause? json_key_uniqueness_constraint json_output_clause? CLOSE_PAREN
3573+
| JSON_ARRAYAGG OPEN_PAREN json_value_expr json_array_aggregate_order_by_clause? json_array_constructor_null_clause? json_output_clause? CLOSE_PAREN
3574+
;
3575+
3576+
json_output_clause
3577+
: RETURNING typename json_format_clause?
3578+
;
3579+
3580+
json_array_aggregate_order_by_clause
3581+
: ORDER BY sortby_list
35673582
;
35683583

35693584
func_expr_common_subexpr
@@ -4175,6 +4190,7 @@ plsqlidentifier
41754190

41764191
unreserved_keyword
41774192
: ABORT_P
4193+
| ABSENT
41784194
| ABSOLUTE_P
41794195
| ACCESS
41804196
| ACTION
@@ -4266,6 +4282,7 @@ unreserved_keyword
42664282
| FIRST_P
42674283
| FOLLOWING
42684284
| FORCE
4285+
| FORMAT
42694286
| FORWARD
42704287
| FUNCTION
42714288
| FUNCTIONS
@@ -4297,7 +4314,9 @@ unreserved_keyword
42974314
| INSTEAD
42984315
| INVOKER
42994316
| ISOLATION
4317+
| JSON
43004318
| KEY
4319+
| KEYS
43014320
| LABEL
43024321
| LANGUAGE
43034322
| LARGE_P
@@ -4495,6 +4514,10 @@ col_name_keyword
44954514
| INT_P
44964515
| INTEGER
44974516
| INTERVAL
4517+
| JSON_ARRAY
4518+
| JSON_ARRAYAGG
4519+
| JSON_OBJECT
4520+
| JSON_OBJECTAGG
44984521
| LEAST
44994522
| NATIONAL
45004523
| NCHAR

postgresql/checkpoint.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Last commit for gram.y at https://github.com/postgres/postgres/blob/master/src/backend/parser/gram.y
2+
7081ac46ace8c459966174400b53418683c9fe5c

postgresql/postgresql_lexer.go

Lines changed: 2980 additions & 2960 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postgresql/postgresql_parser.go

Lines changed: 15660 additions & 14803 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postgresql/postgresqlparser_base_listener.go

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postgresql/postgresqlparser_base_visitor.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postgresql/postgresqlparser_listener.go

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

postgresql/postgresqlparser_visitor.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)