Adjust tests to work with 9.4

PJMODOS · PJMODOS · commit b609f5bc929a · 2015-12-27T18:59:53.000+01:00
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ ifeq ($(PGVER),94)
 PG_CPPFLAGS += $(addprefix -I,$(realpath $(srcdir)/compat))
 OBJS += $(realpath $(srcdir)/compat/pglogical_compat.o)
 DATA += compat/pglogical_origin.control compat/pglogical_origin--1.0.0.sql
+REGRESS = preseed infofuncs init_fail init preseed_check basic extended toasted replication_set add_table matview primary_key foreign_key functions copy drop
 REGRESS += --dbname=regression
 SCRIPTS_built += pglogical_dump/pglogical_dump
 SCRIPTS += pglogical_dump/pglogical_dump
diff --git a/expected/init.out b/expected/init.out
@@ -29,6 +29,12 @@ 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 := 'dbname=regression user=super');
  create_node 
 -------------
@@ -38,6 +44,12 @@ SELECT * FROM pglogical.create_node(node_name := 'test_provider', dsn := 'dbname
 \c :subscriber_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_subscriber', dsn := 'dbname=postgres user=super');
  create_node 
 -------------
diff --git a/pglogical_sync.c b/pglogical_sync.c
@@ -452,8 +452,8 @@ pglogical_sync_worker_cleanup(PGLogicalSubscription *sub)
 	if (replorigin_session_origin != InvalidRepOriginId)
 	{
 		replorigin_session_reset();
-		replorigin_drop(replorigin_session_origin);
 		replorigin_session_origin = InvalidRepOriginId;
+		replorigin_drop(replorigin_session_origin);
 	}
 }
 
diff --git a/sql/init.sql b/sql/init.sql
@@ -32,12 +32,26 @@ 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 := 'dbname=regression user=super');
 
 \c :subscriber_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_subscriber', dsn := 'dbname=postgres user=super');
 
 SELECT * FROM pglogical.create_subscription(

Original file line number	Diff line number	Diff line change
`@@ -452,8 +452,8 @@ pglogical_sync_worker_cleanup(PGLogicalSubscription *sub)`
`452`	`452`	`if (replorigin_session_origin != InvalidRepOriginId)`
`453`	`453`	`{`
`454`	`454`	`replorigin_session_reset();`
`455`		`- replorigin_drop(replorigin_session_origin);`
`456`	`455`	`replorigin_session_origin = InvalidRepOriginId;`
	`456`	`+ replorigin_drop(replorigin_session_origin);`
`457`	`457`	`}`
`458`	`458`	`}`
`459`	`459`