Skip to content

Commit 306c935

Browse files
committed
Upgrade improvements
1 parent c62b207 commit 306c935

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

expected/init.out

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ END;$FUNC$ LANGUAGE plpgsql;
3030
GRANT ALL ON SCHEMA public TO nonsuper;
3131
\c :provider_dsn
3232
SET client_min_messages = 'warning';
33-
CREATE EXTENSION IF NOT EXISTS pglogical;
33+
CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
34+
ALTER EXTENSION pglogical UPDATE;
3435
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
3536
create_node
3637
-------------

expected/init_fail.out

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ GRANT ALL ON ALL TABLES IN SCHEMA pglogical TO nonreplica;
1010
\c :subscriber_dsn
1111
SET client_min_messages = 'warning';
1212
\set VERBOSITY terse
13-
CREATE EXTENSION IF NOT EXISTS pglogical;
13+
CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
14+
ALTER EXTENSION pglogical UPDATE;
1415
-- fail (local node not existing)
1516
SELECT * FROM pglogical.create_subscription(
1617
subscription_name := 'test_subscription',
@@ -63,6 +64,7 @@ SELECT * FROM pglogical.drop_node('test_subscriber');
6364
t
6465
(1 row)
6566

67+
DROP EXTENSION pglogical;
6668
\c :provider_dsn
6769
SELECT * FROM pglogical.drop_node('test_provider');
6870
drop_node
@@ -73,3 +75,4 @@ SELECT * FROM pglogical.drop_node('test_provider');
7375
SET client_min_messages = 'warning';
7476
DROP OWNED BY nonreplica;
7577
DROP ROLE IF EXISTS nonreplica;
78+
DROP EXTENSION pglogical;

pglogical--1.0.0--1.0.1.sql

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,17 @@ RETURNS oid STRICT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'pglogical_create_s
55

66
DO $$
77
BEGIN
8-
IF (SELECT count(1) FROM pglogical.nodes) > 0 THEN
8+
IF (SELECT count(1) FROM pglogical.node) > 0 THEN
99
SELECT * FROM pglogical.create_replication_set('ddl_sql', true, false, false, false);
1010
END IF;
1111
END; $$;
1212

1313
UPDATE pglogical.subscription SET sub_replication_sets = array_append(sub_replication_sets, 'ddl_sql');
1414

15-
BEGIN;
16-
WITH applys AS (
17-
SELECT sub_name FROM pglogical.subscription WHERE sub_enabled
18-
),
19-
WITH disable AS (
20-
SELECT pglogical.alter_subscription_disable(sub_name, true) FROM applys
21-
)
22-
SELECT pglogical.alter_subscription_enable(sub_name, true) FROM applys;
23-
COMMIT;
15+
WITH applys AS (
16+
SELECT sub_name FROM pglogical.subscription WHERE sub_enabled
17+
),
18+
disable AS (
19+
SELECT pglogical.alter_subscription_disable(sub_name, true) FROM applys
20+
)
21+
SELECT pglogical.alter_subscription_enable(sub_name, true) FROM applys;

sql/init.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ GRANT ALL ON SCHEMA public TO nonsuper;
3939

4040
\c :provider_dsn
4141
SET client_min_messages = 'warning';
42-
CREATE EXTENSION IF NOT EXISTS pglogical;
42+
CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
43+
ALTER EXTENSION pglogical UPDATE;
4344

4445
SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
4546

sql/init_fail.sql

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ GRANT ALL ON ALL TABLES IN SCHEMA pglogical TO nonreplica;
1313
\c :subscriber_dsn
1414
SET client_min_messages = 'warning';
1515
\set VERBOSITY terse
16-
CREATE EXTENSION IF NOT EXISTS pglogical;
16+
CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
17+
ALTER EXTENSION pglogical UPDATE;
1718

1819
-- fail (local node not existing)
1920
SELECT * FROM pglogical.create_subscription(
@@ -52,10 +53,12 @@ SELECT * FROM pglogical.create_subscription(
5253
-- cleanup
5354

5455
SELECT * FROM pglogical.drop_node('test_subscriber');
56+
DROP EXTENSION pglogical;
5557

5658
\c :provider_dsn
5759
SELECT * FROM pglogical.drop_node('test_provider');
5860

5961
SET client_min_messages = 'warning';
6062
DROP OWNED BY nonreplica;
6163
DROP ROLE IF EXISTS nonreplica;
64+
DROP EXTENSION pglogical;

0 commit comments

Comments
 (0)