Skip to content

Commit 4cb2eee

Browse files
pallavisontakkepallavisontakke
committed
Parameterize dsns
Allow parameterized provider and subscriber dsns.#52 Required by ansible automation.
1 parent 775b8fb commit 4cb2eee

33 files changed

+655
-469
lines changed

‎expected/add_table.out

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
/* First test whether a table's replication set can be properly manipulated */
2-
\c regression
2+
SELECT * FROM pglogical_regress_variables();
3+
provider_dsn | subscriber_dsn
4+
--------------+----------------
5+
regression | postgres
6+
(1 row)
7+
8+
\gset
9+
\c :provider_dsn
310
SELECT pglogical.replicate_ddl_command($$
411
CREATE SCHEMA "strange.schema-IS";
512
CREATE TABLE public.test_publicschema(id serial primary key, data text);
@@ -62,13 +69,13 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_r
6269

6370
(1 row)
6471

65-
\c postgres
72+
\c :subscriber_dsn
6673
SELECT * FROM public.test_publicschema;
6774
id | data
6875
----+------
6976
(0 rows)
7077

71-
\c regression
78+
\c :provider_dsn
7279
-- move tables back to the subscribed replication set
7380
SELECT * FROM pglogical.replication_set_add_table('default', 'test_publicschema', true);
7481
replication_set_add_table
@@ -88,7 +95,7 @@ SELECT * FROM pglogical.replication_set_add_table('default', '"strange.schema-IS
8895
t
8996
(1 row)
9097

91-
\c postgres
98+
\c :subscriber_dsn
9299
DO $$
93100
-- give it 10 seconds to syncrhonize the tabes
94101
BEGIN
@@ -108,7 +115,7 @@ SELECT sync_kind, sync_subid, sync_nspname, sync_relname, sync_status FROM pglog
108115
f | 3848008564 | | | r
109116
(3 rows)
110117

111-
\c regression
118+
\c :provider_dsn
112119
INSERT INTO public.test_publicschema VALUES(3, 'c');
113120
INSERT INTO public.test_publicschema VALUES(4, 'd');
114121
INSERT INTO "strange.schema-IS".test_strangeschema VALUES(3);
@@ -119,7 +126,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_r
119126

120127
(1 row)
121128

122-
\c postgres
129+
\c :subscriber_dsn
123130
SELECT * FROM public.test_publicschema;
124131
id | data
125132
----+------
@@ -231,7 +238,7 @@ SELECT * FROM pglogical.alter_subscription_remove_replication_set('test_subscrip
231238
t
232239
(1 row)
233240

234-
\c regression
241+
\c :provider_dsn
235242
SELECT * FROM pglogical.replication_set_remove_table('repset_test', '"strange.schema-IS".test_strangeschema');
236243
replication_set_remove_table
237244
------------------------------
@@ -258,7 +265,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), pid) FROM pg_stat_r
258265

259266
(1 row)
260267

261-
\c postgres
268+
\c :subscriber_dsn
262269
SELECT * FROM "strange.schema-IS".test_diff_repset;
263270
id | data
264271
----+------
@@ -275,7 +282,7 @@ SELECT * FROM "strange.schema-IS".test_strangeschema;
275282
4
276283
(4 rows)
277284

278-
\c regression
285+
\c :provider_dsn
279286
SELECT * FROM pglogical.alter_replication_set('repset_test', replicate_insert := false, replicate_update := false, replicate_delete := false, replicate_truncate := false);
280287
alter_replication_set
281288
-----------------------
@@ -287,15 +294,15 @@ INSERT INTO "strange.schema-IS".test_diff_repset VALUES(4);
287294
UPDATE "strange.schema-IS".test_diff_repset SET data = 'data';
288295
DELETE FROM "strange.schema-IS".test_diff_repset WHERE id < 3;
289296
TRUNCATE "strange.schema-IS".test_diff_repset;
290-
\c postgres
297+
\c :subscriber_dsn
291298
SELECT * FROM "strange.schema-IS".test_diff_repset;
292299
id | data
293300
----+------
294301
3 | data
295302
4 | data
296303
(2 rows)
297304

298-
\c regression
305+
\c :provider_dsn
299306
SELECT * FROM pglogical.alter_replication_set('repset_test', replicate_insert := true, replicate_truncate := true);
300307
alter_replication_set
301308
-----------------------
@@ -304,7 +311,7 @@ SELECT * FROM pglogical.alter_replication_set('repset_test', replicate_insert :=
304311

305312
INSERT INTO "strange.schema-IS".test_diff_repset VALUES(5);
306313
INSERT INTO "strange.schema-IS".test_diff_repset VALUES(6);
307-
\c postgres
314+
\c :subscriber_dsn
308315
SELECT * FROM "strange.schema-IS".test_diff_repset;
309316
id | data
310317
----+------
@@ -314,9 +321,9 @@ SELECT * FROM "strange.schema-IS".test_diff_repset;
314321
6 |
315322
(4 rows)
316323

317-
\c regression
324+
\c :provider_dsn
318325
TRUNCATE "strange.schema-IS".test_diff_repset;
319-
\c postgres
326+
\c :subscriber_dsn
320327
SELECT * FROM "strange.schema-IS".test_diff_repset;
321328
id | data
322329
----+------
@@ -328,7 +335,7 @@ SELECT * FROM pglogical.alter_subscription_add_replication_set('test_subscriptio
328335
t
329336
(1 row)
330337

331-
\c regression
338+
\c :provider_dsn
332339
DO $$
333340
BEGIN
334341
FOR i IN 1..100 LOOP

‎expected/basic.out

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
-- basic builtin datatypes
2-
\c regression
2+
SELECT * FROM pglogical_regress_variables();
3+
provider_dsn | subscriber_dsn
4+
--------------+----------------
5+
regression | postgres
6+
(1 row)
7+
8+
\gset
9+
\c :provider_dsn
310
SELECT pglogical.replicate_ddl_command($$
411
CREATE TABLE public.basic_dml (
512
id serial primary key,
@@ -25,10 +32,10 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
2532

2633
(1 row)
2734

28-
\c postgres
35+
\c :subscriber_dsn
2936
ALTER TABLE public.basic_dml ADD COLUMN subonly integer;
3037
ALTER TABLE public.basic_dml ADD COLUMN subonly_def integer DEFAULT 99;
31-
\c regression
38+
\c :provider_dsn
3239
-- check basic insert replication
3340
INSERT INTO basic_dml(other, data, something)
3441
VALUES (5, 'foo', '1 minute'::interval),
@@ -42,7 +49,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
4249

4350
(1 row)
4451

45-
\c postgres
52+
\c :subscriber_dsn
4653
SELECT id, other, data, something FROM basic_dml ORDER BY id;
4754
id | other | data | something
4855
----+-------+------+------------------
@@ -54,15 +61,15 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
5461
(5 rows)
5562

5663
-- update one row
57-
\c regression
64+
\c :provider_dsn
5865
UPDATE basic_dml SET other = '4', data = NULL, something = '3 days'::interval WHERE id = 4;
5966
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
6067
pg_xlog_wait_remote_apply
6168
---------------------------
6269

6370
(1 row)
6471

65-
\c postgres
72+
\c :subscriber_dsn
6673
SELECT id, other, data, something FROM basic_dml ORDER BY id;
6774
id | other | data | something
6875
----+-------+------+------------------
@@ -74,15 +81,15 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
7481
(5 rows)
7582

7683
-- update multiple rows
77-
\c regression
84+
\c :provider_dsn
7885
UPDATE basic_dml SET other = id, data = data || id::text;
7986
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
8087
pg_xlog_wait_remote_apply
8188
---------------------------
8289

8390
(1 row)
8491

85-
\c postgres
92+
\c :subscriber_dsn
8693
SELECT id, other, data, something FROM basic_dml ORDER BY id;
8794
id | other | data | something
8895
----+-------+------+------------------
@@ -93,7 +100,7 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
93100
5 | 5 | |
94101
(5 rows)
95102

96-
\c regression
103+
\c :provider_dsn
97104
UPDATE basic_dml SET other = id, something = something - '10 seconds'::interval WHERE id < 3;
98105
UPDATE basic_dml SET other = id, something = something + '10 seconds'::interval WHERE id > 3;
99106
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
@@ -102,7 +109,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
102109

103110
(1 row)
104111

105-
\c postgres
112+
\c :subscriber_dsn
106113
SELECT id, other, data, something, subonly, subonly_def FROM basic_dml ORDER BY id;
107114
id | other | data | something | subonly | subonly_def
108115
----+-------+------+--------------------+---------+-------------
@@ -114,15 +121,15 @@ SELECT id, other, data, something, subonly, subonly_def FROM basic_dml ORDER BY
114121
(5 rows)
115122

116123
-- delete one row
117-
\c regression
124+
\c :provider_dsn
118125
DELETE FROM basic_dml WHERE id = 2;
119126
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
120127
pg_xlog_wait_remote_apply
121128
---------------------------
122129

123130
(1 row)
124131

125-
\c postgres
132+
\c :subscriber_dsn
126133
SELECT id, other, data, something FROM basic_dml ORDER BY id;
127134
id | other | data | something
128135
----+-------+------+------------------
@@ -133,15 +140,15 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
133140
(4 rows)
134141

135142
-- delete multiple rows
136-
\c regression
143+
\c :provider_dsn
137144
DELETE FROM basic_dml WHERE id < 4;
138145
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
139146
pg_xlog_wait_remote_apply
140147
---------------------------
141148

142149
(1 row)
143150

144-
\c postgres
151+
\c :subscriber_dsn
145152
SELECT id, other, data, something FROM basic_dml ORDER BY id;
146153
id | other | data | something
147154
----+-------+------+------------------
@@ -150,30 +157,30 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
150157
(2 rows)
151158

152159
-- truncate
153-
\c regression
160+
\c :provider_dsn
154161
TRUNCATE basic_dml;
155162
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
156163
pg_xlog_wait_remote_apply
157164
---------------------------
158165

159166
(1 row)
160167

161-
\c postgres
168+
\c :subscriber_dsn
162169
SELECT id, other, data, something FROM basic_dml ORDER BY id;
163170
id | other | data | something
164171
----+-------+------+-----------
165172
(0 rows)
166173

167174
-- copy
168-
\c regression
175+
\c :provider_dsn
169176
\COPY basic_dml FROM STDIN WITH CSV
170177
SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
171178
pg_xlog_wait_remote_apply
172179
---------------------------
173180

174181
(1 row)
175182

176-
\c postgres
183+
\c :subscriber_dsn
177184
SELECT id, other, data, something FROM basic_dml ORDER BY id;
178185
id | other | data | something
179186
------+-------+------+-----------
@@ -183,7 +190,7 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
183190
9003 | 4 | ddd | @ 4 days
184191
(4 rows)
185192

186-
\c regression
193+
\c :provider_dsn
187194
SELECT pglogical.replicate_ddl_command($$
188195
DROP TABLE public.basic_dml CASCADE;
189196
$$);

‎expected/bidirectional.out

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
\c regression
1+
SELECT * FROM pglogical_regress_variables();
2+
provider_dsn | subscriber_dsn
3+
--------------+----------------
4+
regression | postgres
5+
(1 row)
6+
7+
\gset
8+
\c :provider_dsn
29
SELECT * FROM pglogical.create_subscription(
310
subscription_name := 'test_bidirectional',
411
provider_dsn := 'dbname=postgres user=super',
@@ -19,7 +26,7 @@ BEGIN
1926
PERFORM pg_sleep(0.1);
2027
END LOOP;
2128
END;$$;
22-
\c postgres
29+
\c :subscriber_dsn
2330
SELECT pglogical.replicate_ddl_command($$
2431
CREATE TABLE public.basic_dml (
2532
id serial primary key,
@@ -45,7 +52,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
4552

4653
(1 row)
4754

48-
\c regression
55+
\c :provider_dsn
4956
SELECT * FROM pglogical.replication_set_add_table('default', 'basic_dml');
5057
replication_set_add_table
5158
---------------------------
@@ -65,7 +72,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
6572

6673
(1 row)
6774

68-
\c postgres
75+
\c :subscriber_dsn
6976
SELECT id, other, data, something FROM basic_dml ORDER BY id;
7077
id | other | data | something
7178
----+-------+------+------------------
@@ -84,7 +91,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
8491

8592
(1 row)
8693

87-
\c regression
94+
\c :provider_dsn
8895
SELECT id, other, data, something FROM basic_dml ORDER BY id;
8996
id | other | data | something
9097
----+-------+------+-------------------------
@@ -95,7 +102,7 @@ SELECT id, other, data, something FROM basic_dml ORDER BY id;
95102
5 | 5 | |
96103
(5 rows)
97104

98-
\c regression
105+
\c :provider_dsn
99106
SELECT pglogical.replicate_ddl_command($$
100107
DROP TABLE public.basic_dml CASCADE;
101108
$$);
@@ -115,7 +122,7 @@ SELECT pglogical.drop_subscription('test_bidirectional');
115122
1
116123
(1 row)
117124

118-
\c postgres
125+
\c :subscriber_dsn
119126
SELECT count(1) FROM pg_stat_replication;
120127
count
121128
-------

‎expected/copy.out

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
--test COPY
2-
\c regression
2+
SELECT * FROM pglogical_regress_variables();
3+
provider_dsn | subscriber_dsn
4+
--------------+----------------
5+
regression | postgres
6+
(1 row)
7+
8+
\gset
9+
\c :provider_dsn
310
SELECT pglogical.replicate_ddl_command($$
411
CREATE TABLE public.x (
512
a serial primary key,
@@ -53,7 +60,7 @@ SELECT pg_xlog_wait_remote_apply(pg_current_xlog_location(), 0);
5360

5461
(1 row)
5562

56-
\c postgres
63+
\c :subscriber_dsn
5764
SELECT * FROM x ORDER BY a;
5865
a | b | c | d | e
5966
-------+----+-------+--------+----

0 commit comments

Comments
 (0)