From 1c4ea6836bf67b82a11f55dd57703975dfd15e17 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Fri, 3 Jan 2020 11:59:10 +0100 Subject: [PATCH] Normalize tests: shard table names for multi_insert_select_conflict --- src/test/regress/bin/normalize.sed | 8 ++++---- .../regress/expected/multi_insert_select_conflict.out | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index 420c7bb30..b2b562a8d 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -33,10 +33,10 @@ s/ daily_uniques_[0-9]+ / daily_uniques_xxxxxxx /g # In foreign_key_restriction_enforcement, normalize shard names s/"(on_update_fkey_table_|fkey_)[0-9]+"/"\1xxxxxxx"/g -# -## In multi_insert_select_conflict, normalize shard name and constraints -#s/"(target_table_|target_table_|test_ref_table_)[0-9]+"/"\1xxxxxxx"/g -#s/\(col_1\)=\([0-9]+\)/(col_1)=(X)/g + +# In multi_insert_select_conflict, normalize shard name and constraints +s/"(target_table_|target_table_|test_ref_table_)[0-9]+"/"\1xxxxxxx"/g +s/\(col_1\)=\([0-9]+\)/(col_1)=(X)/g # ## In multi_name_lengths, normalize shard names #s/name_len_12345678901234567890123456789012345678_fcd8ab6f_[0-9]+/name_len_12345678901234567890123456789012345678_fcd8ab6f_xxxxx/g diff --git a/src/test/regress/expected/multi_insert_select_conflict.out b/src/test/regress/expected/multi_insert_select_conflict.out index 47a84a9cf..ac30e5043 100644 --- a/src/test/regress/expected/multi_insert_select_conflict.out +++ b/src/test/regress/expected/multi_insert_select_conflict.out @@ -306,8 +306,8 @@ NOTICE: truncate cascades to table "target_table" col_2, col_1 FROM source_table_1 ON CONFLICT (col_1) DO UPDATE SET col_2 = 55 RETURNING *; -ERROR: insert or update on table "target_table_1900000" violates foreign key constraint "fkey_xxxxxxx" -DETAIL: Key (col_1)=(1) is not present in table "test_ref_table_1900012". +ERROR: insert or update on table "target_table_xxxxxxx" violates foreign key constraint "fkey_xxxxxxx" +DETAIL: Key (col_1)=(X) is not present in table "test_ref_table_xxxxxxx". CONTEXT: while executing command on localhost:xxxxx ROLLBACK; BEGIN;