From a4efb60b54ff41af02e558c2b2f25f012a82b0c5 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Mon, 3 Oct 2016 19:49:36 +0200
Subject: [PATCH] Change logicalrelid type in pg_dist_partition and
 pg_dist_shard to regclass

---
 src/backend/distributed/.gitignore              | 6 +++---
 src/backend/distributed/Makefile                | 5 ++++-
 src/backend/distributed/citus--5.2-4--6.0-1.sql | 5 +++++
 src/backend/distributed/citus.control           | 2 +-
 src/backend/distributed/citus.sql               | 4 ++--
 src/test/regress/expected/multi_extension.out   | 1 +
 src/test/regress/sql/multi_extension.sql        | 1 +
 7 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 src/backend/distributed/citus--5.2-4--6.0-1.sql

diff --git a/src/backend/distributed/.gitignore b/src/backend/distributed/.gitignore
index 7d81b0cbe..cdc226f03 100644
--- a/src/backend/distributed/.gitignore
+++ b/src/backend/distributed/.gitignore
@@ -10,6 +10,6 @@
 /tmp_check*
 
 # ignore latest install file
-citus--5.0.sql
-citus--5.?-*.sql
-!citus--5.?-*--5.?-*.sql
+citus--?.?.sql
+citus--?.?-*.sql
+!citus--?.?-*--?.?-*.sql
diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index 070ea09ec..cf6e3e341 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -7,7 +7,8 @@ MODULE_big = citus
 EXTENSION = citus
 EXTVERSIONS = 5.0 5.0-1 5.0-2  \
 	5.1-1 5.1-2 5.1-3 5.1-4 5.1-5 5.1-6 5.1-7 5.1-8 \
-	5.2-1 5.2-2 5.2-3 5.2-4
+	5.2-1 5.2-2 5.2-3 5.2-4 \
+	6.0-1
 
 # All citus--*.sql files in the source directory
 DATA = $(patsubst $(citus_abs_srcdir)/%.sql,%.sql,$(wildcard $(citus_abs_srcdir)/$(EXTENSION)--*--*.sql))
@@ -57,6 +58,8 @@ $(EXTENSION)--5.2-3.sql: $(EXTENSION)--5.2-2.sql $(EXTENSION)--5.2-2--5.2-3.sql
 	cat $^ > $@
 $(EXTENSION)--5.2-4.sql: $(EXTENSION)--5.2-3.sql $(EXTENSION)--5.2-3--5.2-4.sql
 	cat $^ > $@
+$(EXTENSION)--6.0-1.sql: $(EXTENSION)--5.2-4.sql $(EXTENSION)--5.2-4--6.0-1.sql
+	cat $^ > $@
 
 NO_PGXS = 1
 
diff --git a/src/backend/distributed/citus--5.2-4--6.0-1.sql b/src/backend/distributed/citus--5.2-4--6.0-1.sql
new file mode 100644
index 000000000..845a1df73
--- /dev/null
+++ b/src/backend/distributed/citus--5.2-4--6.0-1.sql
@@ -0,0 +1,5 @@
+/* citus--5.2-4--6.0-1.sql */
+
+/* change logicalrelid type to regclass to allow implicit casts to text */
+ALTER TABLE pg_catalog.pg_dist_partition ALTER COLUMN logicalrelid TYPE regclass;
+ALTER TABLE pg_catalog.pg_dist_shard ALTER COLUMN logicalrelid TYPE regclass;
diff --git a/src/backend/distributed/citus.control b/src/backend/distributed/citus.control
index eecbc6d01..1fdf421af 100644
--- a/src/backend/distributed/citus.control
+++ b/src/backend/distributed/citus.control
@@ -1,6 +1,6 @@
 # Citus extension
 comment = 'Citus distributed database'
-default_version = '5.2-4'
+default_version = '6.0-1'
 module_pathname = '$libdir/citus'
 relocatable = false
 schema = pg_catalog
diff --git a/src/backend/distributed/citus.sql b/src/backend/distributed/citus.sql
index 60cc75079..b1b213b6f 100644
--- a/src/backend/distributed/citus.sql
+++ b/src/backend/distributed/citus.sql
@@ -29,7 +29,7 @@ CREATE TYPE citus.distribution_type AS ENUM (
  * Citus tables & corresponding indexes
  *****************************************************************************/
 CREATE TABLE citus.pg_dist_partition(
-    logicalrelid Oid NOT NULL,
+    logicalrelid Oid NOT NULL,    /* type changed to regclass as of version 6.0-1 */
     partmethod "char" NOT NULL,
     partkey text NOT NULL
 );
@@ -39,7 +39,7 @@ ON citus.pg_dist_partition using btree(logicalrelid);
 ALTER TABLE citus.pg_dist_partition SET SCHEMA pg_catalog;
 
 CREATE TABLE citus.pg_dist_shard(
-    logicalrelid oid NOT NULL,
+    logicalrelid oid NOT NULL,    /* type changed to regclass as of version 6.0-1 */
     shardid int8 NOT NULL,
     shardstorage "char" NOT NULL,
     shardalias text,
diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out
index 17c35dac6..fb2f3cca0 100644
--- a/src/test/regress/expected/multi_extension.out
+++ b/src/test/regress/expected/multi_extension.out
@@ -26,6 +26,7 @@ ALTER EXTENSION citus UPDATE TO '5.2-1';
 ALTER EXTENSION citus UPDATE TO '5.2-2';
 ALTER EXTENSION citus UPDATE TO '5.2-3';
 ALTER EXTENSION citus UPDATE TO '5.2-4';
+ALTER EXTENSION citus UPDATE TO '6.0-1';
 -- drop extension an re-create in newest version
 DROP EXTENSION citus;
 \c
diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql
index ea19fbb11..ef1689312 100644
--- a/src/test/regress/sql/multi_extension.sql
+++ b/src/test/regress/sql/multi_extension.sql
@@ -31,6 +31,7 @@ ALTER EXTENSION citus UPDATE TO '5.2-1';
 ALTER EXTENSION citus UPDATE TO '5.2-2';
 ALTER EXTENSION citus UPDATE TO '5.2-3';
 ALTER EXTENSION citus UPDATE TO '5.2-4';
+ALTER EXTENSION citus UPDATE TO '6.0-1';
 
 -- drop extension an re-create in newest version
 DROP EXTENSION citus;