Skip to content

Commit f705df2

Browse files
committed
fix(postgresql): combine plsql_unreserved_keyword to unreserved_keyword and remove unused rules
1 parent 5d97aea commit f705df2

File tree

5 files changed

+14557
-14947
lines changed

5 files changed

+14557
-14947
lines changed

src/grammar/postgresql/PostgreSqlParser.g4

+36-117
Original file line numberDiff line numberDiff line change
@@ -4208,7 +4208,7 @@ function_name
42084208
;
42094209

42104210
usual_name
4211-
: type_usual_name
4211+
: type_function_name
42124212
| colid indirection
42134213
;
42144214

@@ -4285,18 +4285,7 @@ role_list
42854285

42864286
colid
42874287
: identifier
4288-
| unreserved_keyword
42894288
| col_name_keyword
4290-
| plsql_unreserved_keyword
4291-
;
4292-
4293-
index_method_choices
4294-
: identifier
4295-
;
4296-
4297-
exclude_element
4298-
: opt_definition
4299-
| (OPEN_PAREN a_expr CLOSE_PAREN) identifier opt_asc_desc? opt_nulls_order?
43004289
;
43014290

43024291
index_paramenters
@@ -4305,15 +4294,6 @@ index_paramenters
43054294

43064295
type_function_name
43074296
: identifier
4308-
| unreserved_keyword
4309-
| plsql_unreserved_keyword
4310-
| type_func_name_keyword
4311-
;
4312-
4313-
type_usual_name
4314-
: identifier
4315-
| unreserved_keyword
4316-
| plsql_unreserved_keyword
43174297
| type_func_name_keyword
43184298
;
43194299

@@ -4324,15 +4304,12 @@ nonreservedword_column
43244304

43254305
nonreservedword
43264306
: identifier
4327-
| unreserved_keyword
43284307
| col_name_keyword
43294308
| type_func_name_keyword
43304309
;
43314310

43324311
collabel
43334312
: identifier
4334-
| plsql_unreserved_keyword
4335-
| unreserved_keyword
43364313
| col_name_keyword
43374314
| type_func_name_keyword
43384315
| reserved_keyword
@@ -4345,7 +4322,7 @@ identifier
43454322
| UnicodeQuotedIdentifier
43464323
| plsqlvariablename
43474324
| plsqlidentifier
4348-
| plsql_unreserved_keyword
4325+
| unreserved_keyword
43494326
;
43504327

43514328
plsqlidentifier
@@ -4654,6 +4631,39 @@ unreserved_keyword
46544631
| KW_YEAR
46554632
| KW_YES
46564633
| KW_ZONE
4634+
| KW_ALIAS
4635+
| KW_ASSERT
4636+
| KW_CONSTANT
4637+
| KW_DEBUG
4638+
| KW_DEFAULT
4639+
| KW_DIAGNOSTICS
4640+
| KW_DUMP
4641+
| KW_ELSIF
4642+
| KW_ERROR
4643+
| KW_EXCEPTION
4644+
| KW_EXIT
4645+
| KW_GET
4646+
| KW_INFO
4647+
| KW_IS
4648+
| KW_LOG
4649+
| KW_NOTICE
4650+
| KW_OPEN
4651+
| KW_PUBLIC
4652+
| KW_PERFORM
4653+
| KW_PRINT_STRICT_PARAMS
4654+
| KW_QUERY
4655+
| KW_RAISE
4656+
| KW_RETURN
4657+
| KW_REVERSE
4658+
| KW_ROWTYPE
4659+
| KW_SLICE
4660+
| KW_SQLSTATE
4661+
| KW_STACKED
4662+
| KW_USE_COLUMN
4663+
| KW_USE_VARIABLE
4664+
| KW_VARIABLE_CONFLICT
4665+
| KW_WARNING
4666+
| KW_OUTER
46574667
;
46584668

46594669
col_name_keyword
@@ -4850,7 +4860,6 @@ sharp
48504860
option_value
48514861
: sconst
48524862
| reserved_keyword
4853-
| plsql_unreserved_keyword
48544863
| unreserved_keyword
48554864
;
48564865

@@ -5472,97 +5481,7 @@ opt_exitcond
54725481

54735482
any_identifier
54745483
: colid
5475-
| plsql_unreserved_keyword
5476-
;
5477-
5478-
plsql_unreserved_keyword
5479-
: KW_ABSOLUTE
5480-
| KW_ALIAS
5481-
| KW_AND
5482-
| KW_ARRAY
5483-
| KW_ASSERT
5484-
| KW_BACKWARD
5485-
| KW_CALL
5486-
| KW_CHAIN
5487-
| KW_CLOSE
5488-
| KW_COLLATE
5489-
//| COLUMN_NAME
5490-
| KW_COMMIT
5491-
| KW_CONSTANT
5492-
| KW_CONSTRAINT
5493-
//| CONSTRAINT_NAME
5494-
| KW_CONTINUE
5495-
| KW_CURRENT
5496-
| KW_CURSOR
5497-
//| DATATYPE
5498-
| KW_DEBUG
5499-
| KW_DEFAULT
5500-
//| DETAIL
5501-
| KW_DIAGNOSTICS
5502-
| KW_DO
5503-
| KW_DUMP
5504-
| KW_ELSIF
5505-
//| ERRCODE
5506-
| KW_ERROR
5507-
| KW_EXCEPTION
5508-
| KW_EXIT
5509-
| KW_FETCH
5510-
| KW_FIRST
5511-
| KW_FORWARD
5512-
| KW_GET
5513-
//| HINT
5514-
5515-
//| IMPORT
5516-
| KW_INFO
5517-
| KW_INSERT
5518-
| KW_IS
5519-
| KW_LAST
5520-
| KW_LOG
5521-
//| MESSAGE
5522-
5523-
//| MESSAGE_TEXT
5524-
| KW_MOVE
5525-
| KW_NEXT
5526-
| KW_NO
5527-
| KW_NOTICE
5528-
| KW_OPEN
5529-
| KW_OPTION
5530-
| KW_PERFORM
5531-
//| PG_CONTEXT
5532-
5533-
//| PG_DATATYPE_NAME
5534-
5535-
//| PG_EXCEPTION_CONTEXT
5536-
5537-
//| PG_EXCEPTION_DETAIL
5538-
5539-
//| PG_EXCEPTION_HINT
5540-
| KW_PRINT_STRICT_PARAMS
5541-
| KW_PRIOR
5542-
| KW_QUERY
5543-
| KW_RAISE
5544-
| KW_RELATIVE
5545-
| KW_RESET
5546-
| KW_RETURN
5547-
//| RETURNED_SQLSTATE
5548-
| KW_REVERSE
5549-
| KW_ROLLBACK
5550-
//| ROW_COUNT
5551-
| KW_ROWTYPE
5552-
| KW_SCHEMA
5553-
//| SCHEMA_NAME
5554-
| KW_SCROLL
5555-
| KW_SET
5556-
| KW_SLICE
5557-
| KW_SQLSTATE
5558-
| KW_STACKED
5559-
//| TABLE_NAME
5560-
| KW_TYPE
5561-
| KW_USE_COLUMN
5562-
| KW_USE_VARIABLE
5563-
| KW_VARIABLE_CONFLICT
5564-
| KW_WARNING
5565-
| KW_OUTER
5484+
| unreserved_keyword
55665485
;
55675486

55685487
sql_expression

src/lib/postgresql/PostgreSqlParser.interp

+1-5
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)