From c5536f89c6723db7b2af8d93ab544254763b522a Mon Sep 17 00:00:00 2001 From: amit Date: Tue, 20 Feb 2018 18:02:30 +0900 Subject: [PATCH v1 1/2] Adjust partitioned table tests in insert_conflict.sql --- src/test/regress/expected/insert_conflict.out | 24 +++++++++++++++++------- src/test/regress/sql/insert_conflict.sql | 16 +++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/test/regress/expected/insert_conflict.out b/src/test/regress/expected/insert_conflict.out index 2650faedee..a46fe7ec60 100644 --- a/src/test/regress/expected/insert_conflict.out +++ b/src/test/regress/expected/insert_conflict.out @@ -788,14 +788,24 @@ 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 (b unique) 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; +create table parted_conflict_test (a int unique, b char) partition by list (a); +create table parted_conflict_test_1 partition of parted_conflict_test (b unique) for values in (1, 2); +insert into parted_conflict_test values (1, 'a') on conflict (a) do nothing; +ERROR: unexpected failure to find arbiter index +insert into parted_conflict_test values (1, 'a') on conflict (a) do nothing; +ERROR: unexpected failure to find arbiter index -- however, on conflict do update is not supported yet -insert into parted_conflict_test values (1) on conflict (b) do update set a = excluded.a; +insert into parted_conflict_test values (1, 'a') on conflict (b) do update set a = excluded.a; +ERROR: ON CONFLICT DO UPDATE cannot be applied to partitioned table "parted_conflict_test" +insert into parted_conflict_test values (1, 'a') on conflict (a) do update set b = excluded.b; ERROR: ON CONFLICT DO UPDATE cannot be applied to partitioned table "parted_conflict_test" -- but it works OK if we target the partition directly -insert into parted_conflict_test_1 values (1) on conflict (b) do -update set a = excluded.a; +insert into parted_conflict_test_1 values (2, 'a') on conflict (b) do update set a = excluded.a; +insert into parted_conflict_test_1 values (2, 'b') on conflict (a) do update set b = excluded.b; +select * from parted_conflict_test order by a; + a | b +---+--- + 2 | b +(1 row) + drop table parted_conflict_test; diff --git a/src/test/regress/sql/insert_conflict.sql b/src/test/regress/sql/insert_conflict.sql index 32c647e3f8..97affc3726 100644 --- a/src/test/regress/sql/insert_conflict.sql +++ b/src/test/regress/sql/insert_conflict.sql @@ -474,13 +474,15 @@ 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 (b unique) 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; +create table parted_conflict_test (a int unique, b char) partition by list (a); +create table parted_conflict_test_1 partition of parted_conflict_test (b unique) for values in (1, 2); +insert into parted_conflict_test values (1, 'a') on conflict (a) do nothing; +insert into parted_conflict_test values (1, 'a') on conflict (a) do nothing; -- however, on conflict do update is not supported yet -insert into parted_conflict_test values (1) on conflict (b) do update set a = excluded.a; +insert into parted_conflict_test values (1, 'a') on conflict (b) do update set a = excluded.a; +insert into parted_conflict_test values (1, 'a') on conflict (a) do update set b = excluded.b; -- but it works OK if we target the partition directly -insert into parted_conflict_test_1 values (1) on conflict (b) do -update set a = excluded.a; +insert into parted_conflict_test_1 values (2, 'a') on conflict (b) do update set a = excluded.a; +insert into parted_conflict_test_1 values (2, 'b') on conflict (a) do update set b = excluded.b; +select * from parted_conflict_test order by a; drop table parted_conflict_test; -- 2.11.0