Merge branch 'release-1.2.1' into develop

citusdata · Jul 30, 2015 · 5ed207c · 5ed207c
2 parents 4fcaa74 + 8674d0a
commit 5ed207c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### pg_shard v1.2.1 (July 30, 2015) ###
+
+* Fixes update script bug triggered when running in CitusDB
+
 ### pg_shard v1.2.0 (July 28, 2015) ###
 
 * Distribution metadata stays continually in sync with CitusDB

diff --git a/META.json b/META.json
@@ -2,7 +2,7 @@
     "name": "pg_shard",
     "abstract": "Easy sharding for PostgreSQL",
     "description": "Shards and replicates PostgreSQL tables for horizontal scale and high availability. Seamlessly distributes SQL statements, without requiring any application changes.",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "maintainer": "\"Jason Petersen\" <jason@citusdata.com>",
     "license": "lgpl_3_0",
     "prereqs": {
@@ -17,7 +17,7 @@
             "abstract": "Easy sharding for PostgreSQL",
             "file": "sql/pg_shard--1.2.sql",
             "docfile": "README.md",
-            "version": "1.2.0"
+            "version": "1.2.1"
         }
     },
     "release_status": "stable",

diff --git a/updates/pg_shard--1.1--1.2.sql b/updates/pg_shard--1.1--1.2.sql
@@ -12,7 +12,7 @@ LANGUAGE C STABLE STRICT;
 DO $$
 DECLARE
 	use_citus_metadata boolean := false;
-	relation_name oid;
+	relation_name text;
 BEGIN
 	BEGIN
 		PERFORM 'pg_catalog.pg_dist_partition'::regclass;
@@ -27,7 +27,7 @@ BEGIN
 		LOCK TABLE pgs_distribution_metadata.partition IN EXCLUSIVE MODE;
 		FOR relation_name IN SELECT relation_id::regclass::text
 		FROM pgs_distribution_metadata.partition LOOP
-			PERFORM sync_table_metadata_to_citus(relation_id::regclass);
+			PERFORM sync_table_metadata_to_citus(relation_name);
 		END LOOP;
 
 		-- clean up dependencies on configuration objects