From 4edb193f25a39c271ed2ed9eb595c048b60453f1 Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Fri, 23 Nov 2018 10:57:53 +0300 Subject: [PATCH] make the tests parallelizeable helper view table_fkeys_in_workers now allows filtering by schema so that a test case can print out foreign keys in its schema only --- src/test/regress/expected/foreign_key_to_reference_table.out | 4 +++- .../regress/expected/foreign_key_to_reference_table_0.out | 4 +++- src/test/regress/expected/multi_test_helpers.out | 3 ++- src/test/regress/sql/foreign_key_to_reference_table.sql | 4 +++- src/test/regress/sql/multi_test_helpers.sql | 3 ++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/test/regress/expected/foreign_key_to_reference_table.out b/src/test/regress/expected/foreign_key_to_reference_table.out index e09e2d3e5..8b73fa63d 100644 --- a/src/test/regress/expected/foreign_key_to_reference_table.out +++ b/src/test/regress/expected/foreign_key_to_reference_table.out @@ -35,7 +35,9 @@ SELECT relid::regclass::text, refd_relid::regclass::text FROM - table_fkey_cols + table_fkey_cols + WHERE + "schema" = 'fkey_reference_table' ) d $$ )).RESULT::json )::json )).* ; CREATE TABLE referenced_table(id int UNIQUE, test_column int); diff --git a/src/test/regress/expected/foreign_key_to_reference_table_0.out b/src/test/regress/expected/foreign_key_to_reference_table_0.out index 1bec2d9f9..a5e6e4e66 100644 --- a/src/test/regress/expected/foreign_key_to_reference_table_0.out +++ b/src/test/regress/expected/foreign_key_to_reference_table_0.out @@ -35,7 +35,9 @@ SELECT relid::regclass::text, refd_relid::regclass::text FROM - table_fkey_cols + table_fkey_cols + WHERE + "schema" = 'fkey_reference_table' ) d $$ )).RESULT::json )::json )).* ; CREATE TABLE referenced_table(id int UNIQUE, test_column int); diff --git a/src/test/regress/expected/multi_test_helpers.out b/src/test/regress/expected/multi_test_helpers.out index 40073f61e..c72a4487b 100644 --- a/src/test/regress/expected/multi_test_helpers.out +++ b/src/test/regress/expected/multi_test_helpers.out @@ -17,7 +17,8 @@ SELECT rc.constraint_name AS "name", kcu.column_name AS "column_name", uc_kcu.column_name AS "refd_column_name", format('%I.%I', kcu.table_schema, kcu.table_name)::regclass::oid AS relid, - format('%I.%I', uc_kcu.table_schema, uc_kcu.table_name)::regclass::oid AS refd_relid + format('%I.%I', uc_kcu.table_schema, uc_kcu.table_name)::regclass::oid AS refd_relid, + rc.constraint_schema AS "schema" FROM information_schema.referential_constraints rc, information_schema.key_column_usage kcu, information_schema.key_column_usage uc_kcu diff --git a/src/test/regress/sql/foreign_key_to_reference_table.sql b/src/test/regress/sql/foreign_key_to_reference_table.sql index 7ea19ff58..07924bdb5 100644 --- a/src/test/regress/sql/foreign_key_to_reference_table.sql +++ b/src/test/regress/sql/foreign_key_to_reference_table.sql @@ -27,7 +27,9 @@ SELECT relid::regclass::text, refd_relid::regclass::text FROM - table_fkey_cols + table_fkey_cols + WHERE + "schema" = 'fkey_reference_table' ) d $$ )).RESULT::json )::json )).* ; diff --git a/src/test/regress/sql/multi_test_helpers.sql b/src/test/regress/sql/multi_test_helpers.sql index 26bb17882..8577ec74b 100644 --- a/src/test/regress/sql/multi_test_helpers.sql +++ b/src/test/regress/sql/multi_test_helpers.sql @@ -19,7 +19,8 @@ SELECT rc.constraint_name AS "name", kcu.column_name AS "column_name", uc_kcu.column_name AS "refd_column_name", format('%I.%I', kcu.table_schema, kcu.table_name)::regclass::oid AS relid, - format('%I.%I', uc_kcu.table_schema, uc_kcu.table_name)::regclass::oid AS refd_relid + format('%I.%I', uc_kcu.table_schema, uc_kcu.table_name)::regclass::oid AS refd_relid, + rc.constraint_schema AS "schema" FROM information_schema.referential_constraints rc, information_schema.key_column_usage kcu, information_schema.key_column_usage uc_kcu