diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-02 21:34:15 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2018-04-02 21:34:15 +0100 |
| commit | 7cf8a5c302735d193dcf901b87e03e324903c632 (patch) | |
| tree | 0f9815ae865d08f20e7037c148c3078fad0138e7 /src/include/nodes/nodes.h | |
| parent | 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb (diff) | |
| download | postgresql-7cf8a5c302735d193dcf901b87e03e324903c632.tar.gz postgresql-7cf8a5c302735d193dcf901b87e03e324903c632.zip | |
Revert "Modified files for MERGE"
This reverts commit 354f13855e6381d288dfaa52bcd4f2cb0fd4a5eb.
Diffstat (limited to 'src/include/nodes/nodes.h')
| -rw-r--r-- | src/include/nodes/nodes.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index fce48026b6d..443de227041 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -97,7 +97,6 @@ typedef enum NodeTag T_PlanState, T_ResultState, T_ProjectSetState, - T_MergeActionState, T_ModifyTableState, T_AppendState, T_MergeAppendState, @@ -309,8 +308,6 @@ typedef enum NodeTag T_InsertStmt, T_DeleteStmt, T_UpdateStmt, - T_MergeStmt, - T_MergeAction, T_SelectStmt, T_AlterTableStmt, T_AlterTableCmd, @@ -660,8 +657,7 @@ typedef enum CmdType CMD_SELECT, /* select stmt */ CMD_UPDATE, /* update stmt */ CMD_INSERT, /* insert stmt */ - CMD_DELETE, /* delete stmt */ - CMD_MERGE, /* merge stmt */ + CMD_DELETE, CMD_UTILITY, /* cmds like create, destroy, copy, vacuum, * etc. */ CMD_NOTHING /* dummy command for instead nothing rules |