Skip to content

Commit 86f1ede

Browse files
committed
More test fixes
1 parent 33b496e commit 86f1ede

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

expected/bidirectional.out

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
SELECT * FROM pglogical_regress_variables()
22
\gset
33
\c :provider_dsn
4+
DO $$
5+
BEGIN
6+
IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
7+
CREATE EXTENSION IF NOT EXISTS pglogical_origin;
8+
END IF;
9+
END;$$;
410
SELECT * FROM pglogical.create_subscription(
511
subscription_name := 'test_bidirectional',
612
provider_dsn := (SELECT subscriber_dsn FROM pglogical_regress_variables()) || ' user=super',
@@ -114,6 +120,8 @@ SELECT pglogical.drop_subscription('test_bidirectional');
114120
1
115121
(1 row)
116122

123+
SET client_min_messages = 'warning';
124+
DROP EXTENSION IF EXISTS pglogical_origin;
117125
\c :subscriber_dsn
118126
\a
119127
SELECT slot_name FROM pg_replication_slots WHERE database = current_database();

expected/init.out

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ GRANT ALL ON SCHEMA public TO nonsuper;
3131
\c :provider_dsn
3232
SET client_min_messages = 'warning';
3333
CREATE EXTENSION IF NOT EXISTS pglogical;
34-
DO $$
35-
BEGIN
36-
IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
37-
CREATE EXTENSION IF NOT EXISTS pglogical_origin;
38-
END IF;
39-
END;$$;
4034
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
4135
create_node
4236
-------------

sql/bidirectional.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ SELECT * FROM pglogical_regress_variables()
33
\gset
44

55
\c :provider_dsn
6+
DO $$
7+
BEGIN
8+
IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
9+
CREATE EXTENSION IF NOT EXISTS pglogical_origin;
10+
END IF;
11+
END;$$;
612

713
SELECT * FROM pglogical.create_subscription(
814
subscription_name := 'test_bidirectional',
@@ -67,6 +73,9 @@ $$);
6773

6874
SELECT pglogical.drop_subscription('test_bidirectional');
6975

76+
SET client_min_messages = 'warning';
77+
DROP EXTENSION IF EXISTS pglogical_origin;
78+
7079
\c :subscriber_dsn
7180
\a
7281
SELECT slot_name FROM pg_replication_slots WHERE database = current_database();

sql/init.sql

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ GRANT ALL ON SCHEMA public TO nonsuper;
4141
SET client_min_messages = 'warning';
4242
CREATE EXTENSION IF NOT EXISTS pglogical;
4343

44-
DO $$
45-
BEGIN
46-
IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
47-
CREATE EXTENSION IF NOT EXISTS pglogical_origin;
48-
END IF;
49-
END;$$;
50-
5144
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
5245

5346
\c :subscriber_dsn

0 commit comments

Comments
 (0)