| From: | Simon Riggs <simon(at)2ndQuadrant(dot)com> |
|---|---|
| To: | pgsql-committers(at)lists(dot)postgresql(dot)org |
| Subject: | pgsql: Revert "MERGE SQL Command following SQL:2016" |
| Date: | 2018-04-02 20:36:56 |
| Message-ID: | E1f36CG-0002MM-KA@gemulon.postgresql.org |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-committers |
Revert "MERGE SQL Command following SQL:2016"
This reverts commit e6597dc3533946b98acba7871bd4ca1f7a3d4c1d.
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/aa5877bb26347c58a34aee4e460eb1e1123bb096
Modified Files
--------------
doc/src/sgml/ref/merge.sgml | 603 -------
src/backend/executor/nodeMerge.c | 575 -------
src/backend/parser/parse_merge.c | 660 -------
src/include/executor/nodeMerge.h | 22 -
src/include/parser/parse_merge.h | 19 -
src/test/isolation/expected/merge-delete.out | 97 --
.../isolation/expected/merge-insert-update.out | 84 -
.../isolation/expected/merge-match-recheck.out | 106 --
src/test/isolation/expected/merge-update.out | 213 ---
src/test/isolation/specs/merge-delete.spec | 51 -
src/test/isolation/specs/merge-insert-update.spec | 52 -
src/test/isolation/specs/merge-match-recheck.spec | 79 -
src/test/isolation/specs/merge-update.spec | 132 --
src/test/regress/expected/merge.out | 1811 --------------------
src/test/regress/sql/merge.sql | 1173 -------------
15 files changed, 5677 deletions(-)
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Andres Freund | 2018-04-02 20:36:57 | Re: pgsql: Modified files for MERGE |
| Previous Message | Simon Riggs | 2018-04-02 20:36:03 | pgsql: Revert "Modified files for MERGE" |