database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-31 10:30:33 +03:00
Code Activity

MERGE post-commit review

Browse Source 
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
This commit is contained in:
Simon Riggs
2018-04-05 09:54:07 +01:00
parent 1fd8690668
commit 4b2d44031f
11 changed files with 386 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/parser/gram.y
View File

@@ -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; }
;