More test fixes

PJMODOS · PJMODOS · commit 86f1ede20a68 · 2016-01-16T10:58:31.000+01:00
diff --git a/expected/bidirectional.out b/expected/bidirectional.out
@@ -1,6 +1,12 @@
 SELECT * FROM pglogical_regress_variables()
 \gset
 \c :provider_dsn
+DO $$
+BEGIN
+	IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
+		CREATE EXTENSION IF NOT EXISTS pglogical_origin;
+	END IF;
+END;$$;
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_bidirectional',
     provider_dsn := (SELECT subscriber_dsn FROM pglogical_regress_variables()) || ' user=super',
@@ -114,6 +120,8 @@ SELECT pglogical.drop_subscription('test_bidirectional');
                  1
 (1 row)
 
+SET client_min_messages = 'warning';
+DROP EXTENSION IF EXISTS pglogical_origin;
 \c :subscriber_dsn
 \a
 SELECT slot_name FROM pg_replication_slots WHERE database = current_database();
diff --git a/expected/init.out b/expected/init.out
@@ -31,12 +31,6 @@ GRANT ALL ON SCHEMA public TO nonsuper;
 \c :provider_dsn
 SET client_min_messages = 'warning';
 CREATE EXTENSION IF NOT EXISTS pglogical;
-DO $$
-BEGIN
-	IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
-		CREATE EXTENSION IF NOT EXISTS pglogical_origin;
-	END IF;
-END;$$;
 SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
  create_node 
 -------------
diff --git a/sql/bidirectional.sql b/sql/bidirectional.sql
@@ -3,6 +3,12 @@ SELECT * FROM pglogical_regress_variables()
 \gset
 
 \c :provider_dsn
+DO $$
+BEGIN
+	IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
+		CREATE EXTENSION IF NOT EXISTS pglogical_origin;
+	END IF;
+END;$$;
 
 SELECT * FROM pglogical.create_subscription(
     subscription_name := 'test_bidirectional',
@@ -67,6 +73,9 @@ $$);
 
 SELECT pglogical.drop_subscription('test_bidirectional');
 
+SET client_min_messages = 'warning';
+DROP EXTENSION IF EXISTS pglogical_origin;
+
 \c :subscriber_dsn
 \a
 SELECT slot_name FROM pg_replication_slots WHERE database = current_database();
diff --git a/sql/init.sql b/sql/init.sql
@@ -41,13 +41,6 @@ GRANT ALL ON SCHEMA public TO nonsuper;
 SET client_min_messages = 'warning';
 CREATE EXTENSION IF NOT EXISTS pglogical;
 
-DO $$
-BEGIN
-	IF (SELECT setting::integer/100 FROM pg_settings WHERE name = 'server_version_num') = 904 THEN
-		CREATE EXTENSION IF NOT EXISTS pglogical_origin;
-	END IF;
-END;$$;
-
 SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := (SELECT provider_dsn FROM pglogical_regress_variables()) || ' user=super');
 
 \c :subscriber_dsn
