Fix up 2.3.0 to 2.3.1 upgrade

pglogical--2.3.0--2.3.1.sql

@@ -7,3 +7,83 @@ CREATE FUNCTION pglogical.create_subscription(subscription_name name, provider_d
 	synchronize_data boolean = true, forward_origins text[] = '{all}', apply_delay interval DEFAULT '0',
 	force_text_transfer boolean = false)
 RETURNS oid STRICT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'pglogical_create_subscription';
+
+DROP FUNCTION pglogical.show_repset_table_info(regclass, text[]);
+CREATE FUNCTION pglogical.show_repset_table_info(relation regclass, repsets text[], OUT relid oid, OUT nspname text,
+   OUT relname text, OUT att_list text[], OUT has_row_filter boolean)
+RETURNS record STRICT STABLE LANGUAGE c AS 'MODULE_PATHNAME', 'pglogical_show_repset_table_info';
+
+DROP FUNCTION pglogical.show_repset_table_info_by_target(name, name, text[]);
+
+DROP FUNCTION pglogical.replication_set_add_table(name, regclass, boolean, text[], text, name, name);
+CREATE FUNCTION pglogical.replication_set_add_table(set_name name, relation regclass, synchronize_data boolean DEFAULT false,
+        columns text[] DEFAULT NULL, row_filter text DEFAULT NULL)
+RETURNS boolean CALLED ON NULL INPUT VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'pglogical_replication_set_add_table';
+
+DROP FUNCTION pglogical.replication_set_add_sequence(name, regclass, boolean, name, name);
+CREATE FUNCTION pglogical.replication_set_add_sequence(set_name name, relation regclass, synchronize_data boolean DEFAULT false)
+RETURNS boolean VOLATILE LANGUAGE c AS 'MODULE_PATHNAME', 'pglogical_replication_set_add_sequence';
+
+
+ALTER TABLE pglogical.replication_set_table RENAME TO replication_set_table_old;
+
+CREATE TABLE pglogical.replication_set_table (
+    set_id oid NOT NULL,
+    set_reloid regclass NOT NULL,
+    set_att_list text[],
+    set_row_filter pg_node_tree,
+    PRIMARY KEY(set_id, set_reloid)
+) WITH (user_catalog_table=true);
+
+INSERT INTO pglogical.replication_set_table
+    SELECT set_id, set_reloid, set_att_list, set_row_filter FROM pglogical.replication_set_table_old;
+
+DROP VIEW pglogical.tables;
+DROP TABLE pglogical.replication_set_table_old;
+
+ALTER TABLE pglogical.replication_set_seq RENAME TO replication_set_seq_old;
+
+CREATE TABLE pglogical.replication_set_seq (
+    set_id oid NOT NULL,
+    set_seqoid regclass NOT NULL,
+    PRIMARY KEY(set_id, set_seqoid)
+) WITH (user_catalog_table=true);
+
+INSERT INTO pglogical.replication_set_seq
+    SELECT set_id, set_seqoid FROM pglogical.replication_set_seq_old;
+
+DROP TABLE pglogical.replication_set_seq_old;
+
+
+-- must recreate on top of new replication_set_table
+CREATE VIEW pglogical.TABLES AS
+    WITH set_relations AS (
+        SELECT s.set_name, r.set_reloid
+          FROM pglogical.replication_set_table r,
+               pglogical.replication_set s,
+               pglogical.local_node n
+         WHERE s.set_nodeid = n.node_id
+           AND s.set_id = r.set_id
+    ),
+    user_tables AS (
+        SELECT r.oid, n.nspname, r.relname, r.relreplident
+          FROM pg_catalog.pg_class r,
+               pg_catalog.pg_namespace n
+         WHERE r.relkind = 'r'
+           AND r.relpersistence = 'p'
+           AND n.oid = r.relnamespace
+           AND n.nspname !~ '^pg_'
+           AND n.nspname != 'information_schema'
+           AND n.nspname != 'pglogical'
+    )
+    SELECT r.oid AS relid, n.nspname, r.relname, s.set_name
+      FROM pg_catalog.pg_namespace n,
+           pg_catalog.pg_class r,
+           set_relations s
+     WHERE r.relkind = 'r'
+       AND n.oid = r.relnamespace
+       AND r.oid = s.set_reloid
+     UNION
+    SELECT t.oid AS relid, t.nspname, t.relname, NULL
+      FROM user_tables t
+     WHERE t.oid NOT IN (SELECT set_reloid FROM set_relations);

pglogical_functions.c

@@ -143,6 +143,9 @@ PG_FUNCTION_INFO_V1(pglogical_max_proto_version);
 
 PG_FUNCTION_INFO_V1(pglogical_xact_commit_timestamp_origin);
 
+/* Compatibility for upgrading */
+PG_FUNCTION_INFO_V1(pglogical_show_repset_table_info_by_target);
+
 static void gen_slot_name(Name slot_name, char *dbname,
 						  const char *provider_name,
 						  const char *subscriber_name);
@@ -1979,6 +1982,16 @@ pglogical_show_repset_table_info(PG_FUNCTION_ARGS)
 }
 
 
+/*
+ * Dummy function to allow upgrading through all intermediate versions
+ */
+Datum
+pglogical_show_repset_table_info_by_target(PG_FUNCTION_ARGS)
+{
+	abort();
+}
+
+
 /*
  * Decide if to return tuple or not.
  */