diff options
| author | Andres Freund <andres@anarazel.de> | 2015-05-23 00:49:27 +0200 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2015-05-23 00:58:45 +0200 |
| commit | 631d7490074cdaef8026db57a5f2772b8730f600 (patch) | |
| tree | 56d0aee92bbe994583e095111f9ea23135c31d1c /src/include | |
| parent | 49ad32d5d99cb4a79bf648c0b7f9eca19b54cf1d (diff) | |
Remove the new UPSERT command tag and use INSERT instead.
Previously, INSERT with ON CONFLICT DO UPDATE specified used a new
command tag -- UPSERT. It was introduced out of concern that INSERT as
a command tag would be a misrepresentation for ON CONFLICT DO UPDATE, as
some affected rows may actually have been updated.
Alvaro Herrera noticed that the implementation of that new command tag
was incomplete; in subsequent discussion we concluded that having it
doesn't provide benefits that are in line with the compatibility breaks
it requires.
Catversion bump due to the removal of PlannedStmt->isUpsert.
Author: Peter Geoghegan
Discussion: 20150520215816.GI5885@postgresql.org
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 601258f2c2f..6b56fb5eb36 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201505191 +#define CATALOG_VERSION_NO 201505231 #endif diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index b70231919fe..61c84041407 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -45,8 +45,6 @@ typedef struct PlannedStmt bool hasModifyingCTE; /* has insert|update|delete in WITH? */ - bool isUpsert; /* is it insert ... ON CONFLICT UPDATE? */ - bool canSetTag; /* do I set the command result tag? */ bool transientPlan; /* redo plan when TransactionXmin changes? */ |