diff options
Diffstat (limited to 'src/backend/parser')
-rw-r--r-- | src/backend/parser/gram.y | 8 | ||||
-rw-r--r-- | src/backend/parser/parser.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 1b5daf6734b..acf6cf48669 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -824,7 +824,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); /* SQL/JSON related keywords */ %nonassoc UNIQUE JSON %nonassoc KEYS OBJECT_P SCALAR VALUE_P -%nonassoc WITH WITHOUT_LA +%nonassoc WITH WITHOUT /* * To support target_el without AS, it used to be necessary to assign IDENT an @@ -14313,7 +14313,7 @@ ConstInterval: opt_timezone: WITH_LA TIME ZONE { $$ = true; } - | WITHOUT TIME ZONE { $$ = false; } + | WITHOUT_LA TIME ZONE { $$ = false; } | /*EMPTY*/ { $$ = false; } ; @@ -16464,8 +16464,8 @@ json_predicate_type_constraint: json_key_uniqueness_constraint_opt: WITH UNIQUE KEYS { $$ = true; } | WITH UNIQUE { $$ = true; } - | WITHOUT_LA UNIQUE KEYS { $$ = false; } - | WITHOUT_LA UNIQUE { $$ = false; } + | WITHOUT UNIQUE KEYS { $$ = false; } + | WITHOUT UNIQUE { $$ = false; } | /* EMPTY */ %prec KEYS { $$ = false; } ; diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index 65eb0876575..e17c310cc1a 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -241,10 +241,10 @@ base_yylex(YYSTYPE *lvalp, YYLTYPE *llocp, core_yyscan_t yyscanner) break; case WITHOUT: - /* Replace WITHOUT by WITHOUT_LA if it's followed by UNIQUE */ + /* Replace WITHOUT by WITHOUT_LA if it's followed by TIME */ switch (next_token) { - case UNIQUE: + case TIME: cur_token = WITHOUT_LA; break; } |