Added catalog version checking to pgpro_upgrade. Now correct catversion and major version is hardcoded

vbwagner · vbwagner · commit 85e91d7f683f · 2017-08-29T09:22:56.000+03:00
diff --git a/src/pgpro-upgrade/004-pgpro_build.sql b/src/pgpro-upgrade/004-pgpro_build.sql
@@ -0,0 +1 @@
+CREATE FUNCTION pg_catalog.pgpro_build() RETURNS TEXT AS 'pgpro_build' LANGUAGE internal STRICT IMMUTABLE;
diff --git a/src/pgpro-upgrade/004-pgpro_build.test b/src/pgpro-upgrade/004-pgpro_build.test
@@ -0,0 +1 @@
+SELECT COUNT(*) > 0 AS pgpro_build FROM pg_proc WHERE proname = 'pgpro_build' AND pronamespace = 11;
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -27,6 +27,37 @@ case "$PGBIN" in
 ;;
 esac
 
+# Check the catalog version
+CATALOG_VERSION_NO=2016081311
+MAJORVER=$9.6
+CATVER=`${PGBIN}pg_controldata|sed -n '/Catalog version number:/s/^.*: *//p'`
+if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
+	if [ ! -f "${PGDATA}/global/pg_control" ]; then
+		# looks like we have Debian with separate directory for configs
+		SAVE_PGDATA="$PGDATA"
+		PGDATA=`sed -n "/data_directory/{s/^data_directory = '//
+		s/'.*$//
+		p}" /etc/postgresql/9.6/main/postgresql.conf`
+		if [ -z "$PGDATA" -o ! -f "${PGDATA}/global/pg_control" ]; then
+			echo "Cannot find valid database in $PGDATA" 2>&1;
+			exit 1
+		fi
+	fi
+	# Fix pg_control file
+	"${PGBIN}pg_controldata" -c
+	# Fix tablespace directories
+	(cd "$PGDATA/pg_tblspc"
+	 for i in *; do
+	 	[ "$i" = "*" ] && break # Glob pattern not expanded
+		(cd $i; mv PG_${MAJORVER}_$CATVER PG_${MAJORVER}_$CATALOG_VERSION_NO)
+	 done
+	)
+	if [ -n "$SAVE_PGDATA" ] then
+		PGDATA="$SAVE_PGDATA"
+	fi
+fi
+
+
 for dir in "$PGSHARE" /usr/pgsql-9.6/share /usr/share/postgresql/9.6 /usr/pgsql/9.6/share /usr/share/pgsql /usr/share/postgrespro96  ; do
 	if [ -d "$dir/pgpro-upgrade" ]; then
 		DIR="$dir/pgpro-upgrade"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CREATE FUNCTION pg_catalog.pgpro_build() RETURNS TEXT AS 'pgpro_build' LANGUAGE internal STRICT IMMUTABLE;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SELECT COUNT(*) > 0 AS pgpro_build FROM pg_proc WHERE proname = 'pgpro_build' AND pronamespace = 11;`