Merge branch 'PGPRO9_6' into PGPROEE9_6

vbwagner · vbwagner · commit afdee1559750 · 2017-08-31T13:43:49.000+03:00
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -32,6 +32,8 @@ esac
 # Check the catalog version
 CATALOG_VERSION_NO=2016081311
 MAJORVER=9.6
+# catalog version upgrade supported from. Space-separated list
+UPGRADABLE_CATVER="201608131"
 if [ ! -f "${PGDATA}/global/pg_control" -a -f "${PGDATA}/postgresql.conf" ]; then
 	# looks like we have Debian with separate directory for configs
 	SAVE_PGDATA="$PGDATA"
@@ -43,8 +45,19 @@ if [ ! -f "${PGDATA}/global/pg_control" -a -f "${PGDATA}/postgresql.conf" ]; the
 		exit 1
 	fi
 fi
-CATVER=`${PGBIN}pg_controldata|sed -n '/Catalog version number:/s/^.*: *//p'`
+CATVER=`"${PGBIN}pg_controldata"|sed -n '/Catalog version number:/s/^.*: *//p'`
 if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
+	for v in $UPGRADABLE_CATVER; do
+		if [ "$CATVER" = "$v" ]; then
+			upgrade_possible=1
+			break
+		fi
+	done
+	if [ -z "$upgrade_possible" ];  then
+		echo "Upgrade of $PGDATA  from catalog version '$CATVER' is not supported" >&2
+		exit 2
+	fi
+
     if [ -n "$check" ]; then
         echo "Database needs upgrade"
         exit 1
