Skip to content

Commit 7884cbe

Browse files
LuckyFBBHaydenOrz
authored andcommitted
fix(postgresql): combine plsql_unreserved_keyword to unreserved_keyword and remove unused rules
1 parent 5aade9e commit 7884cbe

File tree

6 files changed

+10740
-10932
lines changed

6 files changed

+10740
-10932
lines changed

src/grammar/postgresql/PostgreSqlParser.g4

Lines changed: 40 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -609,9 +609,9 @@ tableelementlist
609609
;
610610

611611
tableelement
612-
: column_def
612+
: (KW_CONSTRAINT colid)? constraintelem
613+
| column_def
613614
| KW_LIKE qualified_name ((KW_INCLUDING | KW_EXCLUDING) tablelikeoption)*
614-
| (KW_CONSTRAINT colid)? constraintelem
615615
;
616616

617617
typedtableelement
@@ -2788,28 +2788,24 @@ role_list
27882788

27892789
colid
27902790
: identifier
2791-
| unreserved_keyword
27922791
| col_name_keyword
2793-
| plsql_unreserved_keyword
27942792
;
27952793

27962794
type_function_name
27972795
: identifier
2798-
| unreserved_keyword
2799-
| plsql_unreserved_keyword
28002796
| type_func_name_keyword
28012797
;
28022798

28032799
nonreservedword
28042800
: identifier
2805-
| unreserved_keyword
28062801
| col_name_keyword
28072802
| type_func_name_keyword
28082803
;
28092804

28102805
collabel
2811-
: nonreservedword
2812-
| plsql_unreserved_keyword
2806+
: identifier
2807+
| col_name_keyword
2808+
| type_func_name_keyword
28132809
| reserved_keyword
28142810
;
28152811

@@ -2820,7 +2816,7 @@ identifier
28202816
| UnicodeQuotedIdentifier
28212817
| PLSQLVARIABLENAME
28222818
| PLSQLIDENTIFIER
2823-
| plsql_unreserved_keyword
2819+
| unreserved_keyword
28242820
;
28252821

28262822
unreserved_keyword
@@ -3125,6 +3121,39 @@ unreserved_keyword
31253121
| KW_YEAR
31263122
| KW_YES
31273123
| KW_ZONE
3124+
| KW_ALIAS
3125+
| KW_ASSERT
3126+
| KW_CONSTANT
3127+
| KW_DEBUG
3128+
| KW_DEFAULT
3129+
| KW_DIAGNOSTICS
3130+
| KW_DUMP
3131+
| KW_ELSIF
3132+
| KW_ERROR
3133+
| KW_EXCEPTION
3134+
| KW_EXIT
3135+
| KW_GET
3136+
| KW_INFO
3137+
| KW_IS
3138+
| KW_LOG
3139+
| KW_NOTICE
3140+
| KW_OPEN
3141+
| KW_PUBLIC
3142+
| KW_PERFORM
3143+
| KW_PRINT_STRICT_PARAMS
3144+
| KW_QUERY
3145+
| KW_RAISE
3146+
| KW_RETURN
3147+
| KW_REVERSE
3148+
| KW_ROWTYPE
3149+
| KW_SLICE
3150+
| KW_SQLSTATE
3151+
| KW_STACKED
3152+
| KW_USE_COLUMN
3153+
| KW_USE_VARIABLE
3154+
| KW_VARIABLE_CONFLICT
3155+
| KW_WARNING
3156+
| KW_OUTER
31283157
;
31293158

31303159
col_name_keyword
@@ -3600,73 +3629,7 @@ proc_condition
36003629

36013630
any_identifier
36023631
: colid
3603-
| plsql_unreserved_keyword
3604-
;
3605-
3606-
plsql_unreserved_keyword
3607-
: KW_ABSOLUTE
3608-
| KW_ALIAS
3609-
| KW_AND
3610-
| KW_ARRAY
3611-
| KW_ASSERT
3612-
| KW_BACKWARD
3613-
| KW_CALL
3614-
| KW_CHAIN
3615-
| KW_CLOSE
3616-
| KW_COLLATE
3617-
| KW_COMMIT
3618-
| KW_CONSTANT
3619-
| KW_CONSTRAINT
3620-
| KW_CONTINUE
3621-
| KW_CURRENT
3622-
| KW_CURSOR
3623-
| KW_DEBUG
3624-
| KW_DEFAULT
3625-
| KW_DIAGNOSTICS
3626-
| KW_DO
3627-
| KW_DUMP
3628-
| KW_ELSIF
3629-
| KW_ERROR
3630-
| KW_EXCEPTION
3631-
| KW_EXIT
3632-
| KW_FETCH
3633-
| KW_FIRST
3634-
| KW_FORWARD
3635-
| KW_GET
3636-
| KW_INFO
3637-
| KW_INSERT
3638-
| KW_IS
3639-
| KW_LAST
3640-
| KW_LOG
3641-
| KW_MOVE
3642-
| KW_NEXT
3643-
| KW_NO
3644-
| KW_NOTICE
3645-
| KW_OPEN
3646-
| KW_OPTION
3647-
| KW_PERFORM
3648-
| KW_PRINT_STRICT_PARAMS
3649-
| KW_PRIOR
3650-
| KW_QUERY
3651-
| KW_RAISE
3652-
| KW_RELATIVE
3653-
| KW_RESET
3654-
| KW_RETURN
3655-
| KW_REVERSE
3656-
| KW_ROLLBACK
3657-
| KW_ROWTYPE
3658-
| KW_SCHEMA
3659-
| KW_SCROLL
3660-
| KW_SET
3661-
| KW_SLICE
3662-
| KW_SQLSTATE
3663-
| KW_STACKED
3664-
| KW_TYPE
3665-
| KW_USE_COLUMN
3666-
| KW_USE_VARIABLE
3667-
| KW_VARIABLE_CONFLICT
3668-
| KW_WARNING
3669-
| KW_OUTER
3632+
| unreserved_keyword
36703633
;
36713634

36723635
sql_expression

src/lib/postgresql/PostgreSqlParser.interp

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)