Skip to content

Commit 92db863

Browse files
PJMODOSPJMODOS
committed
Fix test parametrization
1 parent db7e3ad commit 92db863

33 files changed

+128
-130
lines changed

‎expected/add_table.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
/* First test whether a table's replication set can be properly manipulated */
2-
SELECT * FROM pglogical_regress_variables();
3-
provider_dsn | subscriber_dsn
4-
--------------+----------------
5-
regression | postgres
6-
(1 row)
7-
2+
SELECT * FROM pglogical_regress_variables()
83
\gset
94
\c :provider_dsn
105
SELECT pglogical.replicate_ddl_command($$

‎expected/basic.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
-- basic builtin datatypes
2-
SELECT * FROM pglogical_regress_variables();
3-
provider_dsn | subscriber_dsn
4-
--------------+----------------
5-
regression | postgres
6-
(1 row)
7-
2+
SELECT * FROM pglogical_regress_variables()
83
\gset
94
\c :provider_dsn
105
SELECT pglogical.replicate_ddl_command($$

‎expected/bidirectional.out

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
SELECT * FROM pglogical_regress_variables();
2-
provider_dsn | subscriber_dsn
3-
--------------+----------------
4-
regression | postgres
5-
(1 row)
6-
1+
SELECT * FROM pglogical_regress_variables()
72
\gset
83
\c :provider_dsn
94
SELECT * FROM pglogical.create_subscription(
105
subscription_name := 'test_bidirectional',
11-
provider_dsn := 'dbname=postgres user=super',
6+
provider_dsn := (SELECT subscriber_dsn FROM pglogical_regress_variables()) || ' user=super',
127
synchronize_structure := false,
138
synchronize_data := false,
149
forward_origins := '{}');

‎expected/copy.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
--test COPY
2-
SELECT * FROM pglogical_regress_variables();
3-
provider_dsn | subscriber_dsn
4-
--------------+----------------
5-
regression | postgres
6-
(1 row)
7-
2+
SELECT * FROM pglogical_regress_variables()
83
\gset
94
\c :provider_dsn
105
SELECT pglogical.replicate_ddl_command($$

‎expected/drop.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SELECT * FROM pglogical_regress_variables();
2-
provider_dsn | subscriber_dsn
3-
--------------+----------------
4-
regression | postgres
5-
(1 row)
6-
1+
SELECT * FROM pglogical_regress_variables()
72
\gset
83
\c :provider_dsn
94
SELECT * FROM pglogical.drop_node(node_name := 'test_provider');

‎expected/extended.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
-- complex datatype handling
2-
SELECT * FROM pglogical_regress_variables();
3-
provider_dsn | subscriber_dsn
4-
--------------+----------------
5-
regression | postgres
6-
(1 row)
7-
2+
SELECT * FROM pglogical_regress_variables()
83
\gset
94
\c :provider_dsn
105
SELECT pglogical.replicate_ddl_command($$

‎expected/foreign_key.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
--FOREIGN KEY
2-
SELECT * FROM pglogical_regress_variables();
3-
provider_dsn | subscriber_dsn
4-
--------------+----------------
5-
regression | postgres
6-
(1 row)
7-
2+
SELECT * FROM pglogical_regress_variables()
83
\gset
94
\c :provider_dsn
105
SELECT pglogical.replicate_ddl_command($$

‎expected/functions.out

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
--Immutable, volatile functions and nextval in DEFAULT clause
2-
SELECT * FROM pglogical_regress_variables();
3-
provider_dsn | subscriber_dsn
4-
--------------+----------------
5-
regression | postgres
6-
(1 row)
7-
2+
SELECT * FROM pglogical_regress_variables()
83
\gset
94
\c :provider_dsn
105
SELECT pglogical.replicate_ddl_command($$

‎expected/init.out

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
-- This should be done with pg_regress's --create-role option
22
-- but it's blocked by bug 37906
3-
SELECT * FROM pglogical_regress_variables();
4-
provider_dsn | subscriber_dsn
5-
--------------+----------------
6-
regression | postgres
7-
(1 row)
8-
3+
SELECT * FROM pglogical_regress_variables()
94
\gset
105
SET client_min_messages = 'warning';
116
DROP USER IF EXISTS nonsuper;
@@ -35,7 +30,7 @@ BEGIN
3530
CREATE EXTENSION IF NOT EXISTS pglogical_origin;
3631
END IF;
3732
END;$$;
38-
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname=regression user=super');
33+
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
3934
create_node
4035
-------------
4136
2689511696
@@ -50,21 +45,29 @@ BEGIN
5045
CREATE EXTENSION IF NOT EXISTS pglogical_origin;
5146
END IF;
5247
END;$$;
53-
SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := 'dbname=postgres user=super');
48+
SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := (SELECT subscriber_dsn FROM pglogical_regress_variables()) || ' user=super');
5449
create_node
5550
-------------
5651
1755434425
5752
(1 row)
5853

54+
BEGIN;
5955
SELECT * FROM pglogical.create_subscription(
6056
subscription_name := 'test_subscription',
61-
provider_dsn := 'dbname=regression user=super',
57+
provider_dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super',
6258
forward_origins := '{}');
6359
create_subscription
6460
---------------------
6561
3848008564
6662
(1 row)
6763

64+
/*
65+
* Remove the function we added in preseed because otherwise the restore of
66+
* schema will fail. We do this in same transaction as create_subscription()
67+
* because the subscription process will only start on commit.
68+
*/
69+
DROP FUNCTION IF EXISTS public.pglogical_regress_variables();
70+
COMMIT;
6871
DO $$
6972
BEGIN
7073
FOR i IN 1..300 LOOP

‎expected/init_fail.out

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SELECT * FROM pglogical_regress_variables();
2-
provider_dsn | subscriber_dsn
3-
--------------+----------------
4-
regression | postgres
5-
(1 row)
6-
1+
SELECT * FROM pglogical_regress_variables()
72
\gset
83
\c :provider_dsn
94
SET client_min_messages = 'warning';
@@ -18,11 +13,11 @@ CREATE EXTENSION IF NOT EXISTS pglogical;
1813
-- fail (local node not existing)
1914
SELECT * FROM pglogical.create_subscription(
2015
subscription_name := 'test_subscription',
21-
provider_dsn := 'dbname=regression user=nonreplica',
16+
provider_dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=nonreplica',
2217
forward_origins := '{}');
2318
ERROR: local node not found
2419
-- succeed
25-
SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := 'dbname=postgres user=nonreplica');
20+
SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := (SELECT subscriber_dsn FROM pglogical_regress_variables()) || ' user=nonreplica');
2621
create_node
2722
-------------
2823
1755434425
@@ -31,22 +26,22 @@ SELECT * FROM pglogical.create_node(node_name := 'test_subscriber', dsn := 'dbna
3126
-- fail (can't connect to remote)
3227
SELECT * FROM pglogical.create_subscription(
3328
subscription_name := 'test_subscription',
34-
provider_dsn := 'dbname=regression user=nonexisting',
29+
provider_dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=nonexisting',
3530
forward_origins := '{}');
3631
ERROR: could not connect to the postgresql server: FATAL: role "nonexisting" does not exist
3732

3833
DETAIL: dsn was: dbname=regression user=nonexisting fallback_application_name='create_subscription'
3934
-- fail (remote node not existing)
4035
SELECT * FROM pglogical.create_subscription(
4136
subscription_name := 'test_subscription',
42-
provider_dsn := 'dbname=regression user=nonreplica',
37+
provider_dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=nonreplica',
4338
forward_origins := '{}');
4439
ERROR: could fetch remote node info: ERROR: local node not found
4540

4641

4742
\c :provider_dsn
4843
-- succeed
49-
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname=postgres user=nonreplica');
44+
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=nonreplica');
5045
create_node
5146
-------------
5247
2689511696
@@ -56,7 +51,7 @@ SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname
5651
-- fail (can't connect with replication connection to remote)
5752
SELECT * FROM pglogical.create_subscription(
5853
subscription_name := 'test_subscription',
59-
provider_dsn := 'dbname=regression user=nonreplica',
54+
provider_dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=nonreplica',
6055
forward_origins := '{}');
6156
ERROR: could not connect to the postgresql server in replication mode: FATAL: no pg_hba.conf entry for replication connection from host "[local]", user "nonreplica"
6257

0 commit comments

Comments
 (0)