From 188f9e64402ce70f36e48274927fc6d5784319fa Mon Sep 17 00:00:00 2001 From: amit Date: Fri, 17 Feb 2017 14:18:01 +0900 Subject: [PATCH] ON CONFLICT DO NOTHING should work with partitioned tables Currently, a check in transformInsertStmt() prevents *any* ON CONFLICT clause from being specified on a partitioned table, even those specifying DO NOTHING as the alternative action. It is harmless to allow those, so remove that check. It would still not be possible to use DO UPDATE with partitioned table though, because infer_arbiter_indexes() will eventually error out upon failing to find a unique/exclusion constraint. Remember it is not at the moment possible to create these constraints on partitioned tables. Adds a test and updates the note in document about using ON CONFLICT with partitioned tables. --- doc/src/sgml/ddl.sgml | 9 ++++++--- src/backend/parser/analyze.c | 8 -------- src/test/regress/expected/insert_conflict.out | 10 ++++++++++ src/test/regress/sql/insert_conflict.sql | 10 ++++++++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index f909242e4c..c99951a660 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -3862,9 +3862,12 @@ ANALYZE measurement; - INSERT statements with ON CONFLICT - clause are currently not allowed on partitioned tables, that is, - cause error when specified. + Using the ON CONFLICT clause with partitioned tables + will cause an error if DO UPDATE is specified as the + alternative action, because it requires specifying a unique or exclusion + constraint to determine if there is a conflict. Currently, it is not + possible to create indexes on partitioned tables required to implement + such constraints. diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 0f7659bb6b..a25a7c503a 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -843,16 +843,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt) /* Process ON CONFLICT, if any. */ if (stmt->onConflictClause) - { - /* Bail out if target relation is partitioned table */ - if (pstate->p_target_rangetblentry->relkind == RELKIND_PARTITIONED_TABLE) - ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("ON CONFLICT clause is not supported with partitioned tables"))); - qry->onConflict = transformOnConflictClause(pstate, stmt->onConflictClause); - } /* * If we have a RETURNING clause, we need to add the target relation to diff --git a/src/test/regress/expected/insert_conflict.out b/src/test/regress/expected/insert_conflict.out index 8d005fddd4..c90d381b34 100644 --- a/src/test/regress/expected/insert_conflict.out +++ b/src/test/regress/expected/insert_conflict.out @@ -786,3 +786,13 @@ select * from selfconflict; (3 rows) drop table selfconflict; +-- check that the following works: +-- insert into partitioned_table on conflict do nothing +create table parted_conflict_test (a int, b char) partition by list (a); +create table parted_conflict_test_1 partition of parted_conflict_test for values in (1); +insert into parted_conflict_test values (1, 'a') on conflict do nothing; +insert into parted_conflict_test values (1, 'a') on conflict do nothing; +-- however, on conflict do update not supported yet +insert into parted_conflict_test values (1) on conflict (a) do update set b = excluded.b where excluded.a = 1; +ERROR: there is no unique or exclusion constraint matching the ON CONFLICT specification +drop table parted_conflict_test, parted_conflict_test_1; diff --git a/src/test/regress/sql/insert_conflict.sql b/src/test/regress/sql/insert_conflict.sql index df3a9b59b5..78bffc783d 100644 --- a/src/test/regress/sql/insert_conflict.sql +++ b/src/test/regress/sql/insert_conflict.sql @@ -471,3 +471,13 @@ commit; select * from selfconflict; drop table selfconflict; + +-- check that the following works: +-- insert into partitioned_table on conflict do nothing +create table parted_conflict_test (a int, b char) partition by list (a); +create table parted_conflict_test_1 partition of parted_conflict_test for values in (1); +insert into parted_conflict_test values (1, 'a') on conflict do nothing; +insert into parted_conflict_test values (1, 'a') on conflict do nothing; +-- however, on conflict do update not supported yet +insert into parted_conflict_test values (1) on conflict (a) do update set b = excluded.b where excluded.a = 1; +drop table parted_conflict_test, parted_conflict_test_1; -- 2.11.0