diff options
| author | Simon Riggs | 2018-04-05 08:54:07 +0000 |
|---|---|---|
| committer | Simon Riggs | 2018-04-05 08:54:07 +0000 |
| commit | 4b2d44031f8c005f6f86364d7663858b6b5bdd14 (patch) | |
| tree | 821dec0027fe8caa8ce50250e20a1e594d738e7e /src/backend/parser | |
| parent | 1fd8690668635bab9dfa16b2885e6e474f8451ba (diff) | |
MERGE post-commit review
Review comments from Andres Freund
* Consolidate code into AfterTriggerGetTransitionTable()
* Rename nodeMerge.c to execMerge.c
* Rename nodeMerge.h to execMerge.h
* Move MERGE handling in ExecInitModifyTable()
into a execMerge.c ExecInitMerge()
* Move mt_merge_subcommands flags into execMerge.h
* Rename opt_and_condition to opt_merge_when_and_condition
* Wordsmith various comments
Author: Pavan Deolasee
Reviewer: Simon Riggs
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index b879358de16..1592b58bb47 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -585,7 +585,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); %type <list> hash_partbound partbound_datum_list range_datum_list %type <defelt> hash_partbound_elem -%type <node> merge_when_clause opt_and_condition +%type <node> merge_when_clause opt_merge_when_and_condition %type <list> merge_when_list %type <node> merge_update merge_delete merge_insert @@ -11129,7 +11129,7 @@ merge_when_list: ; merge_when_clause: - WHEN MATCHED opt_and_condition THEN merge_update + WHEN MATCHED opt_merge_when_and_condition THEN merge_update { MergeAction *m = makeNode(MergeAction); @@ -11140,7 +11140,7 @@ merge_when_clause: $$ = (Node *)m; } - | WHEN MATCHED opt_and_condition THEN merge_delete + | WHEN MATCHED opt_merge_when_and_condition THEN merge_delete { MergeAction *m = makeNode(MergeAction); @@ -11151,7 +11151,7 @@ merge_when_clause: $$ = (Node *)m; } - | WHEN NOT MATCHED opt_and_condition THEN merge_insert + | WHEN NOT MATCHED opt_merge_when_and_condition THEN merge_insert { MergeAction *m = makeNode(MergeAction); @@ -11162,7 +11162,7 @@ merge_when_clause: $$ = (Node *)m; } - | WHEN NOT MATCHED opt_and_condition THEN DO NOTHING + | WHEN NOT MATCHED opt_merge_when_and_condition THEN DO NOTHING { MergeAction *m = makeNode(MergeAction); @@ -11175,7 +11175,7 @@ merge_when_clause: } ; -opt_and_condition: +opt_merge_when_and_condition: AND a_expr { $$ = $2; } | { $$ = NULL; } ; |