Upgrade improvements

PJMODOS · PJMODOS · commit 306c93580a22 · 2016-01-18T12:37:17.000+01:00
diff --git a/expected/init.out b/expected/init.out
@@ -30,7 +30,8 @@ END;$FUNC$ LANGUAGE plpgsql;
 GRANT ALL ON SCHEMA public TO nonsuper;
 \c :provider_dsn
 SET client_min_messages = 'warning';
-CREATE EXTENSION IF NOT EXISTS pglogical;
+CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
+ALTER EXTENSION pglogical UPDATE;
 SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
  create_node 
 -------------
diff --git a/expected/init_fail.out b/expected/init_fail.out
@@ -10,7 +10,8 @@ GRANT ALL ON ALL TABLES IN SCHEMA pglogical TO nonreplica;
 \c :subscriber_dsn
 SET client_min_messages = 'warning';
 \set VERBOSITY terse
-CREATE EXTENSION IF NOT EXISTS pglogical;
+CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
+ALTER EXTENSION pglogical UPDATE;
 -- fail (local node not existing)
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_subscription',
@@ -63,6 +64,7 @@ SELECT * FROM pglogical.drop_node('test_subscriber');
  t
 (1 row)
 
+DROP EXTENSION pglogical;
 \c :provider_dsn
 SELECT * FROM pglogical.drop_node('test_provider');
  drop_node 
@@ -73,3 +75,4 @@ SELECT * FROM pglogical.drop_node('test_provider');
 SET client_min_messages = 'warning';
 DROP OWNED BY nonreplica;
 DROP ROLE IF EXISTS nonreplica;
+DROP EXTENSION pglogical;
diff --git a/pglogical--1.0.0--1.0.1.sql b/pglogical--1.0.0--1.0.1.sql
@@ -5,19 +5,17 @@ RETURNS oid STRICT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'pglogical_create_s
 
 DO $$
 BEGIN
-	IF (SELECT count(1) FROM pglogical.nodes) > 0 THEN
+	IF (SELECT count(1) FROM pglogical.node) > 0 THEN
 		SELECT * FROM pglogical.create_replication_set('ddl_sql', true, false, false, false);
 	END IF;
 END; $$;
 
 UPDATE pglogical.subscription SET sub_replication_sets = array_append(sub_replication_sets, 'ddl_sql');
 
-BEGIN;
-	WITH applys AS (
-		SELECT sub_name FROM pglogical.subscription WHERE sub_enabled
-	),
-	WITH disable AS (
-		SELECT pglogical.alter_subscription_disable(sub_name, true) FROM applys
-	)
-	SELECT pglogical.alter_subscription_enable(sub_name, true) FROM applys;
-COMMIT;
+WITH applys AS (
+	SELECT sub_name FROM pglogical.subscription WHERE sub_enabled
+),
+disable AS (
+	SELECT pglogical.alter_subscription_disable(sub_name, true) FROM applys
+)
+SELECT pglogical.alter_subscription_enable(sub_name, true) FROM applys;
diff --git a/sql/init.sql b/sql/init.sql
@@ -39,7 +39,8 @@ GRANT ALL ON SCHEMA public TO nonsuper;
 
 \c :provider_dsn
 SET client_min_messages = 'warning';
-CREATE EXTENSION IF NOT EXISTS pglogical;
+CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
+ALTER EXTENSION pglogical UPDATE;
 
 SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
 
diff --git a/sql/init_fail.sql b/sql/init_fail.sql
@@ -13,7 +13,8 @@ GRANT ALL ON ALL TABLES IN SCHEMA pglogical TO nonreplica;
 \c :subscriber_dsn
 SET client_min_messages = 'warning';
 \set VERBOSITY terse
-CREATE EXTENSION IF NOT EXISTS pglogical;
+CREATE EXTENSION IF NOT EXISTS pglogical VERSION '1.0.0';
+ALTER EXTENSION pglogical UPDATE;
 
 -- fail (local node not existing)
 SELECT * FROM pglogical.create_subscription(
@@ -52,10 +53,12 @@ SELECT * FROM pglogical.create_subscription(
 -- cleanup
 
 SELECT * FROM pglogical.drop_node('test_subscriber');
+DROP EXTENSION pglogical;
 
 \c :provider_dsn
 SELECT * FROM pglogical.drop_node('test_provider');
 
 SET client_min_messages = 'warning';
 DROP OWNED BY nonreplica;
 DROP ROLE IF EXISTS nonreplica;
+DROP EXTENSION pglogical;
