BUG #16045: vacuum_db crash and illegal memory alloc after pg_upgrade from PG11 to PG12

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 617270f101..c6dc50f3e6 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -108,6 +108,13 @@ check_and_dump_old_cluster(bool live_check)
 	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1100)
 		check_for_tables_with_oids(&old_cluster);
 
+	/*
+	 * PG 12 changed the 'sql_identifier' type storage format, so we need
+	 * to prevent upgrade when used in user objects (tables, indexes, ...)
+	 */
+	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1100)
+		old_11_check_for_sql_identifier_data_type_usage(&old_cluster);
+
 	/*
 	 * Pre-PG 10 allowed tables with 'unknown' type columns and non WAL logged
 	 * hash indexes
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 5d31750d86..63574b51bc 100644
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -458,6 +458,8 @@ void		old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster);
 void		old_9_6_invalidate_hash_indexes(ClusterInfo *cluster,
 											bool check_mode);
 
+void		old_11_check_for_sql_identifier_data_type_usage(ClusterInfo *cluster);
+
 /* parallel.c */
 void		parallel_exec_prog(const char *log_file, const char *opt_log_file,
 							   const char *fmt,...) pg_attribute_printf(3, 4);
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 10cb362e09..8d766d3d3a 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -399,3 +399,101 @@ old_9_6_invalidate_hash_indexes(ClusterInfo *cluster, bool check_mode)
 	else
 		check_ok();
 }
+
+/*
+ * old_11_check_for_sql_identifier_data_type_usage()
+ *	11 -> 12
+ *	In 12, the sql_identifier data type was switched from name to varchar,
+ *	which does affect the storage (name is by-ref, but not varlena). This
+ *	means user tables using sql_identifier for columns are broken because
+ *	the on-disk format is different.
+ *
+ *	We need to check all objects that might store sql_identifier on disk,
+ *	i.e. tables, matviews and indexes. Also check composite types in case
+ *	they are used in this context.
+ */
+void
+old_11_check_for_sql_identifier_data_type_usage(ClusterInfo *cluster)
+{
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status("Checking for invalid \"sql_identifier\" user columns");
+
+	snprintf(output_path, sizeof(output_path), "tables_using_sql_identifier.txt");
+
+	for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname,
+					i_attname;
+		DbInfo	   *active_db = &cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(cluster, active_db->db_name);
+
+		res = executeQueryOrDie(conn,
+								"SELECT n.nspname, c.relname, a.attname "
+								"FROM	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n, "
+								"		pg_catalog.pg_attribute a "
+								"WHERE	c.oid = a.attrelid AND "
+								"		NOT a.attisdropped AND "
+								"		a.atttypid = 'information_schema.sql_identifier'::pg_catalog.regtype AND "
+								"		c.relkind IN ("
+								CppAsString2(RELKIND_RELATION) ", "
+								CppAsString2(RELKIND_COMPOSITE_TYPE) ", "
+								CppAsString2(RELKIND_MATVIEW) ", "
+								CppAsString2(RELKIND_INDEX) ") AND "
+								"		c.relnamespace = n.oid AND "
+		/* exclude possible orphaned temp tables */
+								"		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_toast_temp_' AND "
+								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		i_attname = PQfnumber(res, "attname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
+				pg_fatal("could not open file \"%s\": %s\n", output_path,
+						 strerror(errno));
+			if (!db_used)
+			{
+				fprintf(script, "Database: %s\n", active_db->db_name);
+				db_used = true;
+			}
+			fprintf(script, "  %s.%s.%s\n",
+					PQgetvalue(res, rowno, i_nspname),
+					PQgetvalue(res, rowno, i_relname),
+					PQgetvalue(res, rowno, i_attname));
+		}
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+
+	if (script)
+		fclose(script);
+
+	if (found)
+	{
+		pg_log(PG_REPORT, "fatal\n");
+		pg_fatal("Your installation contains the \"sql_identifier\" data type in user tables\n"
+				 "and/or indexes.  The on-disk format for this data type has changed, so this\n"
+				 "cluster cannot currently be upgraded.  You can remove the problem tables or\n"
+				 "change the data type to \"name\" and restart the upgrade.\n"
+				 "A list of the problem columns is in the file:\n"
+				 "    %s\n\n", output_path);
+	}
+	else
+		check_ok();
+}

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 617270f101..c6dc50f3e6 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -108,6 +108,13 @@ check_and_dump_old_cluster(bool live_check)
 	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1100)
 		check_for_tables_with_oids(&old_cluster);
 
+	/*
+	 * PG 12 changed the 'sql_identifier' type storage format, so we need
+	 * to prevent upgrade when used in user objects (tables, indexes, ...)
+	 */
+	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1100)
+		old_11_check_for_sql_identifier_data_type_usage(&old_cluster);
+
 	/*
 	 * Pre-PG 10 allowed tables with 'unknown' type columns and non WAL logged
 	 * hash indexes
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index 5d31750d86..63574b51bc 100644
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -458,6 +458,8 @@ void		old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster);
 void		old_9_6_invalidate_hash_indexes(ClusterInfo *cluster,
 											bool check_mode);
 
+void		old_11_check_for_sql_identifier_data_type_usage(ClusterInfo *cluster);
+
 /* parallel.c */
 void		parallel_exec_prog(const char *log_file, const char *opt_log_file,
 							   const char *fmt,...) pg_attribute_printf(3, 4);
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 10cb362e09..e0b9a9f574 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -399,3 +399,121 @@ old_9_6_invalidate_hash_indexes(ClusterInfo *cluster, bool check_mode)
 	else
 		check_ok();
 }
+
+/*
+ * old_11_check_for_sql_identifier_data_type_usage()
+ *	11 -> 12
+ *	In 12, the sql_identifier data type was switched from name to varchar,
+ *	which does affect the storage (name is by-ref, but not varlena). This
+ *	means user tables using sql_identifier for columns are broken because
+ *	the on-disk format is different.
+ *
+ *	We need to check all objects that might store sql_identifier on disk,
+ *	i.e. tables, matviews and indexes. Also check composite types in case
+ *	they are used in this context.
+ */
+void
+old_11_check_for_sql_identifier_data_type_usage(ClusterInfo *cluster)
+{
+	int			dbnum;
+	FILE	   *script = NULL;
+	bool		found = false;
+	char		output_path[MAXPGPATH];
+
+	prep_status("Checking for invalid \"sql_identifier\" user columns");
+
+	snprintf(output_path, sizeof(output_path), "tables_using_sql_identifier.txt");
+
+	for (dbnum = 0; dbnum < cluster->dbarr.ndbs; dbnum++)
+	{
+		PGresult   *res;
+		bool		db_used = false;
+		int			ntups;
+		int			rowno;
+		int			i_nspname,
+					i_relname,
+					i_attname;
+		DbInfo	   *active_db = &cluster->dbarr.dbs[dbnum];
+		PGconn	   *conn = connectToServer(cluster, active_db->db_name);
+
+		/*
+		 * We need the recursive CTE because the sql_identifier may be wrapped
+		 * either in a domain or composite type, or both (in arbitrary order).
+		 */
+		res = executeQueryOrDie(conn,
+								"WITH RECURSIVE oids AS ( "
+		/* the sql_identifier type itself */
+								"	SELECT 'information_schema.sql_identifier'::regtype AS oid "
+								"	UNION ALL "
+								"	SELECT * FROM ( "
+		/* domains on the type */
+								"		WITH x AS (SELECT oid FROM oids) "
+								"			SELECT t.oid FROM pg_catalog.pg_type t, x WHERE typbasetype = x.oid AND typtype = 'd' "
+								"			UNION "
+		/* composite types containing the type */
+								"			SELECT t.oid FROM pg_catalog.pg_type t, pg_catalog.pg_class c, pg_catalog.pg_attribute a, x "
+								"			WHERE t.typtype = 'c' AND "
+								"				  t.oid = c.reltype AND "
+								"				  c.oid = a.attrelid AND "
+								"				  a.atttypid = x.oid "
+								"	) foo "
+								") "
+								"SELECT n.nspname, c.relname, a.attname "
+								"FROM	pg_catalog.pg_class c, "
+								"		pg_catalog.pg_namespace n, "
+								"		pg_catalog.pg_attribute a "
+								"WHERE	c.oid = a.attrelid AND "
+								"		NOT a.attisdropped AND "
+								"		a.atttypid IN (SELECT oid FROM oids) AND "
+								"		c.relkind IN ("
+								CppAsString2(RELKIND_RELATION) ", "
+								CppAsString2(RELKIND_MATVIEW) ", "
+								CppAsString2(RELKIND_INDEX) ") AND "
+								"		c.relnamespace = n.oid AND "
+		/* exclude possible orphaned temp tables */
+								"		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_toast_temp_' AND "
+								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
+
+		ntups = PQntuples(res);
+		i_nspname = PQfnumber(res, "nspname");
+		i_relname = PQfnumber(res, "relname");
+		i_attname = PQfnumber(res, "attname");
+		for (rowno = 0; rowno < ntups; rowno++)
+		{
+			found = true;
+			if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
+				pg_fatal("could not open file \"%s\": %s\n", output_path,
+						 strerror(errno));
+			if (!db_used)
+			{
+				fprintf(script, "Database: %s\n", active_db->db_name);
+				db_used = true;
+			}
+			fprintf(script, "  %s.%s.%s\n",
+					PQgetvalue(res, rowno, i_nspname),
+					PQgetvalue(res, rowno, i_relname),
+					PQgetvalue(res, rowno, i_attname));
+		}
+
+		PQclear(res);
+
+		PQfinish(conn);
+	}
+
+	if (script)
+		fclose(script);
+
+	if (found)
+	{
+		pg_log(PG_REPORT, "fatal\n");
+		pg_fatal("Your installation contains the \"sql_identifier\" data type in user tables\n"
+				 "and/or indexes.  The on-disk format for this data type has changed, so this\n"
+				 "cluster cannot currently be upgraded.  You can remove the problem tables or\n"
+				 "change the data type to \"name\" and restart the upgrade.\n"
+				 "A list of the problem columns is in the file:\n"
+				 "    %s\n\n", output_path);
+	}
+	else
+		check_ok();
+}

From 52821ea02fca502ff070508ee7be278563117509 Mon Sep 17 00:00:00 2001
From: Tomas Vondra <tv@fuzzy.cz>
Date: Tue, 15 Oct 2019 01:16:21 +0200
Subject: [PATCH 1/2] Correct the check for pg_catalog.line in pg_upgrade

The pg_upgrade check for pg_catalog.line data type when upgrading from
9.3 had a number of issues with domains and composite types. Firstly, it
detected even composite types unused in objects with storage. So for
example this was enough to trigger pg_upgrade failure:

  CREATE TYPE line_composite AS (l pg_catalog.line)

On the other hand, this only happened with composite types directly on
the pg_catalog.line data type, but not with a domain. So this was not
detected

  CREATE DOMAIN line_domain AS pg_catalog.line;
  CREATE TYPE line_composite_2 AS (l line_domain);

unlike the first example. What's worse, we have not detected this even
when used in a table. So we missed cases like this:

  CREATE TABLE t (l line_composite_2);

This fixes these false positives and false negatives by adopting the same
recursive CTE introduced by eaf900e842 for sql_identifier. Backpatch all
the way to 9.4, where the storage for pg_catalog.line data type changed.

Author: Tomas Vondra
Backpatch-to: 9.4-
Discussion: https://postgr.es/m/16045-673e8fa6b5ace196%40postgresql.org
---
 src/bin/pg_upgrade/version.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index 8375a46454..cfe69ea554 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -131,14 +131,41 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)
 		DbInfo	   *active_db = &cluster->dbarr.dbs[dbnum];
 		PGconn	   *conn = connectToServer(cluster, active_db->db_name);
 
+		/*
+		 * We need the recursive CTE because the pg_catalog.line may be wrapped
+		 * either in a domain or composite type, or both (9.3 did not allow domains
+		 * on composite types, but there may be multi-level composite type).
+		 */
 		res = executeQueryOrDie(conn,
+								"WITH RECURSIVE oids AS ( "
+		/* the pg_catalog.line type itself */
+								"	SELECT 'pg_catalog.line'::pg_catalog.regtype AS oid "
+								"	UNION ALL "
+								"	SELECT * FROM ( "
+		/* domains on the type */
+								"		WITH x AS (SELECT oid FROM oids) "
+								"			SELECT t.oid FROM pg_catalog.pg_type t, x WHERE typbasetype = x.oid AND typtype = 'd' "
+								"			UNION "
+		/* composite types containing the type */
+								"			SELECT t.oid FROM pg_catalog.pg_type t, pg_catalog.pg_class c, pg_catalog.pg_attribute a, x "
+								"			WHERE t.typtype = 'c' AND "
+								"				  t.oid = c.reltype AND "
+								"				  c.oid = a.attrelid AND "
+								"				  NOT a.attisdropped AND "
+								"				  a.atttypid = x.oid "
+								"	) foo "
+								") "
 								"SELECT n.nspname, c.relname, a.attname "
 								"FROM	pg_catalog.pg_class c, "
 								"		pg_catalog.pg_namespace n, "
 								"		pg_catalog.pg_attribute a "
 								"WHERE	c.oid = a.attrelid AND "
 								"		NOT a.attisdropped AND "
-								"		a.atttypid = 'pg_catalog.line'::pg_catalog.regtype AND "
+								"		a.atttypid IN (SELECT oid FROM oids) AND "
+								"		c.relkind IN ("
+								CppAsString2(RELKIND_RELATION) ", "
+								CppAsString2(RELKIND_MATVIEW) ", "
+								CppAsString2(RELKIND_INDEX) ") AND "
 								"		c.relnamespace = n.oid AND "
 		/* exclude possible orphaned temp tables */
 								"		n.nspname !~ '^pg_temp_' AND "
-- 
2.21.0

From de98ca82812798e6b7392196fdcf34dff8a78133 Mon Sep 17 00:00:00 2001
From: Tomas Vondra <tv@fuzzy.cz>
Date: Tue, 15 Oct 2019 01:16:47 +0200
Subject: [PATCH 2/2] Correct the check for pg_catalog.unknown in pg_upgrade

The pg_upgrade check for pg_catalog.unknown type when upgrading from 9.6
had a couple of issues with domains and composite types. Firstly, it
detected even composite types unused in objects with storage. So for
example this was enough to trigger pg_upgrade failure:

  CREATE TYPE unknown_composite AS (u pg_catalog.unknown)

On the other hand, this only happened with composite types directly on
the pg_catalog.unknown data type, but not with a domain. So this was not
detected

  CREATE DOMAIN unknown_domain AS pg_catalog.unknown;
  CREATE TYPE unknown_composite_2 AS (u unknown_domain);

unlike the first example. What's worse, we have not detected this even
when used in a table. So we missed cases like this:

  CREATE TABLE t (u unknown_composite_2);

This fixes these false positives and false negatives by using the same
recursive CTE introduced by eaf900e842 for sql_identifier. Backpatch all
the way to 10, where the of pg_catalog.unknown data type was restricted.

Author: Tomas Vondra
Backpatch-to: 10-
Discussion: https://postgr.es/m/16045-673e8fa6b5ace196%40postgresql.org
---
 src/bin/pg_upgrade/version.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index cfe69ea554..ccfb83c7eb 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -256,16 +256,33 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster)
 		PGconn	   *conn = connectToServer(cluster, active_db->db_name);
 
 		res = executeQueryOrDie(conn,
+								"WITH RECURSIVE oids AS ( "
+		/* the sql_identifier type itself */
+								"	SELECT 'pg_catalog.unknown'::pg_catalog.regtype AS oid "
+								"	UNION ALL "
+								"	SELECT * FROM ( "
+		/* domains on the type */
+								"		WITH x AS (SELECT oid FROM oids) "
+								"			SELECT t.oid FROM pg_catalog.pg_type t, x WHERE typbasetype = x.oid AND typtype = 'd' "
+								"			UNION "
+		/* composite types containing the type */
+								"			SELECT t.oid FROM pg_catalog.pg_type t, pg_catalog.pg_class c, pg_catalog.pg_attribute a, x "
+								"			WHERE t.typtype = 'c' AND "
+								"				  t.oid = c.reltype AND "
+								"				  c.oid = a.attrelid AND "
+								"				  NOT a.attisdropped AND "
+								"				  a.atttypid = x.oid "
+								"	) foo "
+								") "
 								"SELECT n.nspname, c.relname, a.attname "
 								"FROM	pg_catalog.pg_class c, "
 								"		pg_catalog.pg_namespace n, "
 								"		pg_catalog.pg_attribute a "
 								"WHERE	c.oid = a.attrelid AND "
 								"		NOT a.attisdropped AND "
-								"		a.atttypid = 'pg_catalog.unknown'::pg_catalog.regtype AND "
+								"		a.atttypid IN (SELECT oid FROM oids) AND "
 								"		c.relkind IN ("
 								CppAsString2(RELKIND_RELATION) ", "
-								CppAsString2(RELKIND_COMPOSITE_TYPE) ", "
 								CppAsString2(RELKIND_MATVIEW) ") AND "
 								"		c.relnamespace = n.oid AND "
 		/* exclude possible orphaned temp tables */
-- 
2.21.0

diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
new file mode 100644
index b64171d..3f7c8c5
*** a/src/bin/pg_upgrade/version.c
--- b/src/bin/pg_upgrade/version.c
*************** old_11_check_for_sql_identifier_data_typ
*** 540,546 ****
  						 strerror(errno));
  			if (!db_used)
  			{
! 				fprintf(script, "Database: %s\n", active_db->db_name);
  				db_used = true;
  			}
  			fprintf(script, "  %s.%s.%s\n",
--- 540,546 ----
  						 strerror(errno));
  			if (!db_used)
  			{
! 				fprintf(script, "In database: %s\n", active_db->db_name);
  				db_used = true;
  			}
  			fprintf(script, "  %s.%s.%s\n",

From e9d70f3d043211011f7c7774ed2ed5eaee3760dc Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 22:31:19 -0600
Subject: [PATCH 1/2] WIP: pg_upgrade/test.sh: changes needed to allow testing
 upgrade from v11

---
 src/bin/pg_upgrade/check.c |  2 +-
 src/bin/pg_upgrade/test.sh | 44 ++++++++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 357997972b..6dfe3cff65 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -122,7 +122,7 @@ check_and_dump_old_cluster(bool live_check)
 	 * to prevent upgrade when used in user objects (tables, indexes, ...).
 	 */
 	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1100)
-		old_11_check_for_sql_identifier_data_type_usage(&old_cluster);
+		; // old_11_check_for_sql_identifier_data_type_usage(&old_cluster);
 
 	/*
 	 * Pre-PG 10 allowed tables with 'unknown' type columns and non WAL logged
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 04aa7fd9f5..b39265f66d 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,7 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	"$1" -N -A trust
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -108,6 +108,9 @@ export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
 mkdir "$outputdir"/testtablespace
 
+mkdir "$outputdir"/sql
+mkdir "$outputdir"/expected
+
 logdir=`pwd`/log
 rm -rf "$logdir"
 mkdir "$logdir"
@@ -175,13 +178,36 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 				fix_sql="DROP FUNCTION public.myfunc(integer); DROP FUNCTION public.oldstyle_length(integer, text);"
 				;;
 			*)
-				fix_sql="DROP FUNCTION public.oldstyle_length(integer, text);"
+				fix_sql="DROP FUNCTION IF EXISTS public.oldstyle_length(integer, text);"
+
+				# commit 1ed6b8956
+				fix_sql="$fix_sql DROP OPERATOR public.#@# (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.#%# (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.!=- (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);"
+
+				# commit 76f412ab3
+				fix_sql="$fix_sql DROP OPERATOR IF EXISTS @#@(bigint,NONE);"
+				fix_sql="$fix_sql DROP OPERATOR IF EXISTS @#@(NONE,bigint);"
+
+				# commit 9e38c2bb5 and 97f73a978
+				fix_sql="$fix_sql DROP AGGREGATE IF EXISTS array_larger_accum (anyarray);"
+				fix_sql="$fix_sql DROP AGGREGATE IF EXISTS array_cat_accum(anyarray);"
+				fix_sql="$fix_sql DROP AGGREGATE IF EXISTS first_el_agg_any(anyelement);"
+
+				# commit 578b22971
+				fix_sql="$fix_sql ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				fix_sql="$fix_sql ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+				fix_sql="$fix_sql ALTER TABLE public.emp SET WITHOUT OIDS;"
+				fix_sql="$fix_sql ALTER TABLE public.tt7 SET WITHOUT OIDS;"
 				;;
 		esac
+
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
@@ -227,23 +253,29 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -p "
 # Windows hosts don't support Unix-y permissions.
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type f -perm /127 -ls`
+		if [ -n "$x" ]; then
 			echo "files in PGDATA with permission != 640";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type d -perm 027 -ls`
+		if [ "$x" ]; then
 			echo "directories in PGDATA with permission != 750";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then
-- 
2.17.0

From 7cdcf46561948a2011a88945bac7d05cb1f13baa Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH 2/2] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 42 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 42 ++++++++++++++++++++++
 3 files changed, 85 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 192445878d..aa0a4fd9be 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 274130e706..2feefc7224 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -631,3 +631,45 @@ WHERE pronargs != 2
 ----------+------------+---------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'<foo>bar</foo>'::xml,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+-- 'pg_class'::regclass, 'english'::regconfig, 'simple'::regdictionary, 'pg_catalog'::regnamespace, 
+-- -- 'POSIX'::regcollation,
+-- -- '+'::regoper,
+-- '*(integer,integer)'::regoperator,
+-- -- 'sum'::regproc,
+-- 'sum(int4)'::regprocedure, USER::regrole, 'regtype'::regtype type,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+AND NOT typname~'_|^char$|^reg'
+AND oid != ALL(ARRAY['gtsvector', 'regcollation', 'regoper', 'regproc']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attrelid='manytypes'::regclass)
+ORDER BY 1,2,3,4;
+ typname | typtype | typelem | typarray | typarray 
+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 4b492ce062..f2b490a9c6 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -467,3 +467,45 @@ FROM pg_range p1 JOIN pg_proc p ON p.oid = p1.rngsubdiff
 WHERE pronargs != 2
     OR proargtypes[0] != rngsubtype OR proargtypes[1] != rngsubtype
     OR prorettype != 'pg_catalog.float8'::regtype;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'<foo>bar</foo>'::xml,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+-- 'pg_class'::regclass, 'english'::regconfig, 'simple'::regdictionary, 'pg_catalog'::regnamespace, 
+-- -- 'POSIX'::regcollation,
+-- -- '+'::regoper,
+-- '*(integer,integer)'::regoperator,
+-- -- 'sum'::regproc,
+-- 'sum(int4)'::regprocedure, USER::regrole, 'regtype'::regtype type,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+AND NOT typname~'_|^char$|^reg'
+AND oid != ALL(ARRAY['gtsvector', 'regcollation', 'regoper', 'regproc']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attrelid='manytypes'::regclass)
+ORDER BY 1,2,3,4;
-- 
2.17.0

From 6a5bcdf6b3c9244e164455792cec612e317cb8d3 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 22:31:19 -0600
Subject: [PATCH v2 1/3] WIP: pg_upgrade/test.sh: changes needed to allow
 testing upgrade from v11

---
 src/bin/pg_upgrade/test.sh | 92 ++++++++++++++++++++++++++++++++++----
 1 file changed, 84 insertions(+), 8 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 04aa7fd9f5..9733217535 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,7 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	"$1" -N -A trust
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -108,6 +108,9 @@ export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
 mkdir "$outputdir"/testtablespace
 
+mkdir "$outputdir"/sql
+mkdir "$outputdir"/expected
+
 logdir=`pwd`/log
 rm -rf "$logdir"
 mkdir "$logdir"
@@ -172,16 +175,83 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 		fix_sql=""
 		case $oldpgversion in
 			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer); DROP FUNCTION public.oldstyle_length(integer, text);"
+				fix_sql="$fix_sql DROP FUNCTION public.myfunc(integer);"
 				;;
-			*)
-				fix_sql="DROP FUNCTION public.oldstyle_length(integer, text);"
+		esac
+
+		# Removed in v10 commit 5ded4bd21
+		case $oldpgversion in
+			804??|9????)
+				fix_sql="$fix_sql DROP FUNCTION public.oldstyle_length(integer, text);"
+				;;
+		esac
+
+		# commit 068503c76511cdb0080bab689662a20e86b9c845
+		case $oldpgversion in
+			10????) # XXX
+				fix_sql="$fix_sql DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
+				;;
+		esac
+
+		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
+		case $oldpgversion in
+			10????) # XXX
+				fix_sql="$fix_sql DROP FUNCTION boxarea(box);"
+				fix_sql="$fix_sql DROP FUNCTION funny_dup17();"
 				;;
 		esac
+
+		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+		case $oldpgversion in
+			10????) # XXX
+				fix_sql="$fix_sql DROP TABLE abstime_tbl;"
+				fix_sql="$fix_sql DROP TABLE reltime_tbl;"
+				fix_sql="$fix_sql DROP TABLE tinterval_tbl;"
+				;;
+		esac
+
+		# Various things removed for v14
+		case $oldpgversion in
+			804??|9????|10????|11????|12????|13????)
+				# commit 76f412ab3
+				# This one is only needed for v11+ ??
+				# (see below for more operators removed that also apply to older versions)
+				fix_sql="$fix_sql DROP OPERATOR public.!=- (pg_catalog.int8, NONE);"
+				;;
+		esac
+		case $oldpgversion in
+			804??|9????|10????|11????|12????|13????)
+				# commit 76f412ab3
+				fix_sql="$fix_sql DROP OPERATOR public.#@# (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.#%# (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);"
+
+				# commit 9e38c2bb5 and 97f73a978
+				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
+				fix_sql="$fix_sql DROP AGGREGATE array_cat_accum(anyarray);"
+				fix_sql="$fix_sql DROP AGGREGATE first_el_agg_any(anyelement);"
+
+				# commit 76f412ab3
+				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
+				fix_sql="$fix_sql DROP OPERATOR @#@(NONE,bigint);"
+				;;
+		esac
+
+		# commit 578b22971: OIDS removed in v12
+		case $oldpgversion in
+			804??|9????|10????|11????)
+				fix_sql="$fix_sql ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				fix_sql="$fix_sql ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+				fix_sql="$fix_sql ALTER TABLE public.emp SET WITHOUT OIDS;"
+				fix_sql="$fix_sql ALTER TABLE public.tt7 SET WITHOUT OIDS;"
+				;;
+		esac
+
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
@@ -227,23 +297,29 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -p "
 # Windows hosts don't support Unix-y permissions.
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type f -perm /127 -ls`
+		if [ -n "$x" ]; then
 			echo "files in PGDATA with permission != 640";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type d -perm /027 -ls`
+		if [ "$x" ]; then
 			echo "directories in PGDATA with permission != 750";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then
-- 
2.17.0

From 6feef4f0ef4637a2daca7114e7a5c2df687d738d Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH v2 2/3] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 38 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 37 +++++++++++++++++++++
 3 files changed, 76 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 192445878d..aa0a4fd9be 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 13567ddf84..97cf72bf78 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -660,3 +660,41 @@ WHERE pronargs != 2
 ----------+------------+---------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+-- reg* cannot be pg_upgraded
+AND NOT typname~'_|^char$|^reg'
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['gtsvector', 'xml']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
+ typname | typtype | typelem | typarray | typarray 
+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 8c6e614f20..e3012b0888 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -489,3 +489,40 @@ FROM pg_range p1 JOIN pg_proc p ON p.oid = p1.rngsubdiff
 WHERE pronargs != 2
     OR proargtypes[0] != rngsubtype OR proargtypes[1] != rngsubtype
     OR prorettype != 'pg_catalog.float8'::regtype;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+-- reg* cannot be pg_upgraded
+AND NOT typname~'_|^char$|^reg'
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['gtsvector', 'xml']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
-- 
2.17.0

From a1114c3db36891f169122383db136fd8fb47cb10 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 22:31:19 -0600
Subject: [PATCH v3 1/2] WIP: pg_upgrade/test.sh: changes needed to allow
 testing upgrade from v11

---
 src/bin/pg_upgrade/test.sh | 92 ++++++++++++++++++++++++++++++++++----
 1 file changed, 84 insertions(+), 8 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 04aa7fd9f5..9733217535 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,7 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	"$1" -N -A trust
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -108,6 +108,9 @@ export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
 mkdir "$outputdir"/testtablespace
 
+mkdir "$outputdir"/sql
+mkdir "$outputdir"/expected
+
 logdir=`pwd`/log
 rm -rf "$logdir"
 mkdir "$logdir"
@@ -172,16 +175,83 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 		fix_sql=""
 		case $oldpgversion in
 			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer); DROP FUNCTION public.oldstyle_length(integer, text);"
+				fix_sql="$fix_sql DROP FUNCTION public.myfunc(integer);"
 				;;
-			*)
-				fix_sql="DROP FUNCTION public.oldstyle_length(integer, text);"
+		esac
+
+		# Removed in v10 commit 5ded4bd21
+		case $oldpgversion in
+			804??|9????)
+				fix_sql="$fix_sql DROP FUNCTION public.oldstyle_length(integer, text);"
+				;;
+		esac
+
+		# commit 068503c76511cdb0080bab689662a20e86b9c845
+		case $oldpgversion in
+			10????) # XXX
+				fix_sql="$fix_sql DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
+				;;
+		esac
+
+		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
+		case $oldpgversion in
+			10????) # XXX
+				fix_sql="$fix_sql DROP FUNCTION boxarea(box);"
+				fix_sql="$fix_sql DROP FUNCTION funny_dup17();"
 				;;
 		esac
+
+		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+		case $oldpgversion in
+			10????) # XXX
+				fix_sql="$fix_sql DROP TABLE abstime_tbl;"
+				fix_sql="$fix_sql DROP TABLE reltime_tbl;"
+				fix_sql="$fix_sql DROP TABLE tinterval_tbl;"
+				;;
+		esac
+
+		# Various things removed for v14
+		case $oldpgversion in
+			804??|9????|10????|11????|12????|13????)
+				# commit 76f412ab3
+				# This one is only needed for v11+ ??
+				# (see below for more operators removed that also apply to older versions)
+				fix_sql="$fix_sql DROP OPERATOR public.!=- (pg_catalog.int8, NONE);"
+				;;
+		esac
+		case $oldpgversion in
+			804??|9????|10????|11????|12????|13????)
+				# commit 76f412ab3
+				fix_sql="$fix_sql DROP OPERATOR public.#@# (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.#%# (pg_catalog.int8, NONE);"
+				fix_sql="$fix_sql DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);"
+
+				# commit 9e38c2bb5 and 97f73a978
+				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
+				fix_sql="$fix_sql DROP AGGREGATE array_cat_accum(anyarray);"
+				fix_sql="$fix_sql DROP AGGREGATE first_el_agg_any(anyelement);"
+
+				# commit 76f412ab3
+				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
+				fix_sql="$fix_sql DROP OPERATOR @#@(NONE,bigint);"
+				;;
+		esac
+
+		# commit 578b22971: OIDS removed in v12
+		case $oldpgversion in
+			804??|9????|10????|11????)
+				fix_sql="$fix_sql ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				fix_sql="$fix_sql ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+				fix_sql="$fix_sql ALTER TABLE public.emp SET WITHOUT OIDS;"
+				fix_sql="$fix_sql ALTER TABLE public.tt7 SET WITHOUT OIDS;"
+				;;
+		esac
+
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
@@ -227,23 +297,29 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -p "
 # Windows hosts don't support Unix-y permissions.
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type f -perm /127 -ls`
+		if [ -n "$x" ]; then
 			echo "files in PGDATA with permission != 640";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type d -perm /027 -ls`
+		if [ "$x" ]; then
 			echo "directories in PGDATA with permission != 750";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then
-- 
2.17.0

From 40269cc927cbb723256b1e6995f7aeefcad6ceac Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH v3 2/2] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 38 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 37 +++++++++++++++++++++
 3 files changed, 76 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index d9ce961be2..f67e3853ff 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 0c74dc96a8..f3476bbf10 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -672,3 +672,41 @@ WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
 ----------+------------+---------------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+-- reg* cannot be pg_upgraded
+AND NOT typname~'_|^char$|^reg'
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['gtsvector', 'xml']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
+ typname | typtype | typelem | typarray | typarray 
+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 4739aca84a..ef08e5d010 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -495,3 +495,40 @@ WHERE pronargs != 2
 SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
 FROM pg_range p1
 WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+-- reg* cannot be pg_upgraded
+AND NOT typname~'_|^char$|^reg'
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['gtsvector', 'xml']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
-- 
2.17.0

From b3f829ab0fd880962d43eac0222bdaab2b8070f4 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 22:31:19 -0600
Subject: [PATCH v4 1/3] WIP: pg_upgrade/test.sh: changes needed to allow
 testing upgrade to v14dev from v9.5-v13

---
 src/bin/pg_upgrade/test.sh | 93 +++++++++++++++++++++++++++++++++++---
 1 file changed, 86 insertions(+), 7 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index ca923ba01b..b36fca4233 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -177,18 +177,97 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 		esac
 		fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
-					public.oldstyle_length(integer, text);	-- last in 9.6
+					public.oldstyle_length(integer, text);"	# last in 9.6 -- commit 5ded4bd21
+		fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
-					public.putenv(text);	-- last in v13
-				 DROP OPERATOR IF EXISTS	-- last in v13
-					public.#@# (pg_catalog.int8, NONE),
-					public.#%# (pg_catalog.int8, NONE),
-					public.!=- (pg_catalog.int8, NONE),
+					public.putenv(text);"	# last in v13
+		# last in v13 commit 76f412ab3
+		# public.!=- This one is only needed for v11+ ??
+		# Note, until v10, operators could only be dropped one at a time
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.#@# (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.#%# (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.!=- (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
 					public.#@%# (pg_catalog.int8, NONE);"
+
+		# commit 068503c76511cdb0080bab689662a20e86b9c845
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
+				;;
+		esac
+
+		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP FUNCTION boxarea(box);"
+				fix_sql="$fix_sql
+					DROP FUNCTION funny_dup17();"
+				;;
+		esac
+
+		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP TABLE abstime_tbl;"
+				fix_sql="$fix_sql
+					DROP TABLE reltime_tbl;"
+				fix_sql="$fix_sql
+					DROP TABLE tinterval_tbl;"
+				;;
+		esac
+
+		# Various things removed for v14
+		case $oldpgversion in
+			906??|10????|11????|12????|13????)
+				fix_sql="$fix_sql
+					DROP AGGREGATE first_el_agg_any(anyelement);"
+				;;
+		esac
+		case $oldpgversion in
+			90[56]??|10????|11????|12????|13????)
+				# commit 9e38c2bb5 and 97f73a978
+				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
+				fix_sql="$fix_sql
+					DROP AGGREGATE array_cat_accum(anyarray);"
+
+				# commit 76f412ab3
+				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
+				fix_sql="$fix_sql
+					DROP OPERATOR @#@(NONE,bigint);"
+				;;
+		esac
+
+		# commit 578b22971: OIDS removed in v12
+		case $oldpgversion in
+			804??|9????|10????|11????)
+				fix_sql="$fix_sql
+					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				fix_sql="$fix_sql
+					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+				fix_sql="$fix_sql
+					ALTER TABLE public.emp SET WITHOUT OIDS;"
+				fix_sql="$fix_sql
+					ALTER TABLE public.tt7 SET WITHOUT OIDS;"
+				;;
+		esac
+
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	echo "fix_sql: $oldpgversion: $fix_sql" >&2
+	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
-- 
2.17.0

From 093a976220a6bdbca13a17e0b2c0d6256b2b74fa Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 11 Jan 2021 21:41:16 -0600
Subject: [PATCH v4 2/3] More changes needed to allow upgrade testing:

These all seem to complicate use of pg_upgrade/test.sh:

e78900afd217fa3eaa77c51e23a94c1466af421c Create by default sql/ and expected/ for output directory in pg_regress
40b132c1afbb4b1494aa8e48cc35ec98d2b90777 In the pg_upgrade test suite, don't write to src/test/regress.
fc49e24fa69a15efacd5b8958115ed9c43c48f9a Make WAL segment size configurable at initdb time.
c37b3d08ca6873f9d4eaf24c72a90a550970cbb8 Allow group access on PGDATA
da9b580d89903fee871cf54845ffa2b26bda2e11 Refactor dir/file permissions
---
 src/bin/pg_upgrade/test.sh | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index b36fca4233..ab45801c35 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,7 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	"$1" -N -A trust
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -108,6 +108,9 @@ export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
 mkdir "$outputdir"/testtablespace
 
+mkdir "$outputdir"/sql
+mkdir "$outputdir"/expected
+
 logdir=`pwd`/log
 rm -rf "$logdir"
 mkdir "$logdir"
@@ -313,23 +316,29 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -p "
 # Windows hosts don't support Unix-y permissions.
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type f -perm /127 -ls`
+		if [ -n "$x" ]; then
 			echo "files in PGDATA with permission != 640";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 case $testhost in
 	MINGW*) ;;
-	*)	if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
+	*)
+		x=`find "$PGDATA" -type d -perm /027 -ls`
+		if [ "$x" ]; then
 			echo "directories in PGDATA with permission != 750";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then
-- 
2.17.0

From 91fe77ad5501e0feb26067f369077715565c7ced Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH v4 3/3] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes to notice if the
binary format is accidentally changed again, as happened at:
7c15cef86 Base information_schema.sql_identifier domain on name, not varchar.

I checked that if I cherry-pick to v11, and comment out
old_11_check_for_sql_identifier_data_type_usage(), then pg_upgrade/test.sh
detects the original problem:
pg_dump: error: Error message from server: ERROR:  invalid memory alloc request size 18446744073709551613

I understand the buildfarm has its own cross-version-upgrade test, which I
think would catch this on its own.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 39 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 38 +++++++++++++++++++++
 3 files changed, 78 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index d9ce961be2..f67e3853ff 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 0c74dc96a8..598a39ae03 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -672,3 +672,42 @@ WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
 ----------+------------+---------------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+-- reg* cannot be pg_upgraded
+AND NOT typname~'_|^char$|^reg'
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['gtsvector', 'xml']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
+ typname | typtype | typelem | typarray | typarray 
+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 4739aca84a..1df9859118 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -495,3 +495,41 @@ WHERE pronargs != 2
 SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
 FROM pg_range p1
 WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no;
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table (or some other non-catalog table processed by pg_upgrade).
+SELECT typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typnamespace IN ('pg_catalog'::regnamespace, 'information_schema'::regnamespace)
+AND typtype IN ('b', 'e', 'd')
+-- reg* cannot be pg_upgraded
+AND NOT typname~'_|^char$|^reg'
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['gtsvector', 'xml']::regtype[])
+AND NOT EXISTS (SELECT * FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
-- 
2.17.0

From 79bed0997a1c720f103100697bdaa0cb1ee1261d Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 22:31:19 -0600
Subject: [PATCH v5 1/4] WIP: pg_upgrade/test.sh: changes needed to allow
 testing upgrade to v14dev from v9.5-v13

---
 src/bin/pg_upgrade/test.sh | 93 +++++++++++++++++++++++++++++++++++---
 1 file changed, 86 insertions(+), 7 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 1ba326decd..9288cfdda8 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -176,18 +176,97 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 		esac
 		fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
-					public.oldstyle_length(integer, text);	-- last in 9.6
+					public.oldstyle_length(integer, text);"	# last in 9.6 -- commit 5ded4bd21
+		fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
-					public.putenv(text);	-- last in v13
-				 DROP OPERATOR IF EXISTS	-- last in v13
-					public.#@# (pg_catalog.int8, NONE),
-					public.#%# (pg_catalog.int8, NONE),
-					public.!=- (pg_catalog.int8, NONE),
+					public.putenv(text);"	# last in v13
+		# last in v13 commit 76f412ab3
+		# public.!=- This one is only needed for v11+ ??
+		# Note, until v10, operators could only be dropped one at a time
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.#@# (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.#%# (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.!=- (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
 					public.#@%# (pg_catalog.int8, NONE);"
+
+		# commit 068503c76511cdb0080bab689662a20e86b9c845
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
+				;;
+		esac
+
+		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP FUNCTION boxarea(box);"
+				fix_sql="$fix_sql
+					DROP FUNCTION funny_dup17();"
+				;;
+		esac
+
+		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP TABLE abstime_tbl;"
+				fix_sql="$fix_sql
+					DROP TABLE reltime_tbl;"
+				fix_sql="$fix_sql
+					DROP TABLE tinterval_tbl;"
+				;;
+		esac
+
+		# Various things removed for v14
+		case $oldpgversion in
+			906??|10????|11????|12????|13????)
+				fix_sql="$fix_sql
+					DROP AGGREGATE first_el_agg_any(anyelement);"
+				;;
+		esac
+		case $oldpgversion in
+			90[56]??|10????|11????|12????|13????)
+				# commit 9e38c2bb5 and 97f73a978
+				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
+				fix_sql="$fix_sql
+					DROP AGGREGATE array_cat_accum(anyarray);"
+
+				# commit 76f412ab3
+				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
+				fix_sql="$fix_sql
+					DROP OPERATOR @#@(NONE,bigint);"
+				;;
+		esac
+
+		# commit 578b22971: OIDS removed in v12
+		case $oldpgversion in
+			804??|9????|10????|11????)
+				fix_sql="$fix_sql
+					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				fix_sql="$fix_sql
+					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+				fix_sql="$fix_sql
+					ALTER TABLE public.emp SET WITHOUT OIDS;"
+				fix_sql="$fix_sql
+					ALTER TABLE public.tt7 SET WITHOUT OIDS;"
+				;;
+		esac
+
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	echo "fix_sql: $oldpgversion: $fix_sql" >&2
+	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
-- 
2.17.0

From 8280518a897e3745ede459e31cc78c9e4b0efdbe Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 11 Jan 2021 21:41:16 -0600
Subject: [PATCH v5 2/4] More changes needed to allow upgrade testing:

These all seem to complicate use of pg_upgrade/test.sh:

e78900afd217fa3eaa77c51e23a94c1466af421c Create by default sql/ and expected/ for output directory in pg_regress
40b132c1afbb4b1494aa8e48cc35ec98d2b90777 In the pg_upgrade test suite, don't write to src/test/regress.
fc49e24fa69a15efacd5b8958115ed9c43c48f9a Make WAL segment size configurable at initdb time.
c37b3d08ca6873f9d4eaf24c72a90a550970cbb8 Allow group access on PGDATA
da9b580d89903fee871cf54845ffa2b26bda2e11 Refactor dir/file permissions
---
 src/bin/pg_upgrade/test.sh | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 9288cfdda8..74c29229ac 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,13 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	if [ -z "$oldsrc" ]
+	then
+		"$1" -N -A trust --wal-segsize 1 -g
+	else
+		"$1" -N -A trust
+	fi
+
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -106,6 +112,10 @@ outputdir="$temp_root/regress"
 EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --outputdir=$outputdir"
 export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
+mkdir "$outputdir"/testtablespace
+
+mkdir "$outputdir"/sql
+mkdir "$outputdir"/expected
 
 logdir=`pwd`/log
 rm -rf "$logdir"
@@ -311,24 +321,29 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -p "
 # make sure all directories and files have group permissions, on Unix hosts
 # Windows hosts don't support Unix-y permissions.
 case $testhost in
-	MINGW*|CYGWIN*) ;;
-	*)	if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
-			echo "files in PGDATA with permission != 640";
+	*)
+		x=`find "$PGDATA" -type f ! -perm 600 ! -perm 640 -ls`
+		if [ -n "$x" ]; then
+			echo "files in PGDATA with permission NOT IN (600, 640)";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 case $testhost in
 	MINGW*|CYGWIN*) ;;
-	*)	if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
-			echo "directories in PGDATA with permission != 750";
+	*)
+		x=`find "$PGDATA" -type d ! -perm 700 ! -perm 750 -ls`
+		if [ "$x" ]; then
+			echo "directories in PGDATA with permission NOT IN (700, 750)";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then
-- 
2.17.0

From 787dd9cd5a2088c8e545691bf1d532466c8311d6 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH v5 3/4] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes to notice if the
binary format is accidentally changed again, as happened at:
7c15cef86 Base information_schema.sql_identifier domain on name, not varchar.

I checked that if I cherry-pick to v11, and comment out
old_11_check_for_sql_identifier_data_type_usage(), then pg_upgrade/test.sh
detects the original problem:
pg_dump: error: Error message from server: ERROR:  invalid memory alloc request size 18446744073709551613

I understand the buildfarm has its own cross-version-upgrade test, which I
think would catch this on its own.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 55 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 54 +++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index d9ce961be2..f67e3853ff 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 5480f979c6..9ae2922169 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -674,3 +674,58 @@ WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
 ----------+------------+---------------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'foo'::"char", 'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type, 'pg_monitor'::regrole,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot, '16/B374D848'::pg_lsn,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no,
+'venus'::planets, 'i16'::insenum,
+'(1,2)'::int4range, '{(1,2)}'::int4multirange,
+'(3,4)'::int8range, '{(3,4)}'::int8multirange,
+'(1,2)'::float8range, '{(1,2)}'::float8multirange,
+'(3,4)'::numrange, '{(3,4)}'::nummultirange,
+'(a,b)'::textrange, '{(a,b)}'::textmultirange,
+'(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+'(2020-01-02, 2021-02-03)'::daterange,
+'{(2020-01-02, 2021-02-03)}'::datemultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+arrayrange(ARRAY[1,2], ARRAY[2,1]),
+arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+-- And now a test on the previous test, checking that all core types are
+-- included in this table
+-- XXX or some other non-catalog table processed by pg_upgrade
+SELECT oid, typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typtype NOT IN ('p', 'c')
+-- reg* which cannot be pg_upgraded
+AND oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper', 'regoperator', 'regconfig', 'regdictionary', 'regnamespace', 'regcollation']::regtype[])
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['xml', 'gtsvector', 'pg_node_tree', 'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list']::regtype[])
+AND NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray=t.oid) -- exclude arrays
+AND NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
+ oid | typname | typtype | typelem | typarray | typarray 
+-----+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 4739aca84a..668fe92778 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -495,3 +495,57 @@ WHERE pronargs != 2
 SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
 FROM pg_range p1
 WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'foo'::"char", 'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type, 'pg_monitor'::regrole,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot, '16/B374D848'::pg_lsn,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no,
+'venus'::planets, 'i16'::insenum,
+'(1,2)'::int4range, '{(1,2)}'::int4multirange,
+'(3,4)'::int8range, '{(3,4)}'::int8multirange,
+'(1,2)'::float8range, '{(1,2)}'::float8multirange,
+'(3,4)'::numrange, '{(3,4)}'::nummultirange,
+'(a,b)'::textrange, '{(a,b)}'::textmultirange,
+'(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+'(2020-01-02, 2021-02-03)'::daterange,
+'{(2020-01-02, 2021-02-03)}'::datemultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+arrayrange(ARRAY[1,2], ARRAY[2,1]),
+arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table
+-- XXX or some other non-catalog table processed by pg_upgrade
+SELECT oid, typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typtype NOT IN ('p', 'c')
+-- reg* which cannot be pg_upgraded
+AND oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper', 'regoperator', 'regconfig', 'regdictionary', 'regnamespace', 'regcollation']::regtype[])
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['xml', 'gtsvector', 'pg_node_tree', 'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list']::regtype[])
+AND NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray=t.oid) -- exclude arrays
+AND NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
-- 
2.17.0

From 7190f3b6b19cd23d8a6b2eca2374ac1e92d94d18 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 6 Mar 2021 18:35:26 -0600
Subject: [PATCH v5 4/4] Move pg_upgrade kludges to sql script

---
 src/bin/pg_upgrade/test-upgrade.sql | 89 ++++++++++++++++++++++++++
 src/bin/pg_upgrade/test.sh          | 96 +----------------------------
 2 files changed, 90 insertions(+), 95 deletions(-)
 create mode 100644 src/bin/pg_upgrade/test-upgrade.sql

diff --git a/src/bin/pg_upgrade/test-upgrade.sql b/src/bin/pg_upgrade/test-upgrade.sql
new file mode 100644
index 0000000000..3dadd6ea74
--- /dev/null
+++ b/src/bin/pg_upgrade/test-upgrade.sql
@@ -0,0 +1,89 @@
+-- This file has a bunch of kludges needed for upgrading testing across major versions
+
+SELECT
+	ver >= 804 AND ver <= 1100 AS fromv84v11,
+	ver >= 905 AND ver <= 1300 AS fromv95v13,
+	ver >= 906 AND ver <= 1300 AS fromv96v13,
+	ver <= 80400 AS fromv84,
+	ver <= 90500 AS fromv95,
+	ver <= 90600 AS fromv96,
+	ver <= 100000 AS fromv10,
+	ver <= 110000 AS fromv11,
+	ver <= 120000 AS fromv12,
+	ver <= 130000 AS fromv13
+	FROM (SELECT current_setting('server_version_num')::int/100 AS ver) AS v;
+\gset
+
+\if :fromv84
+DROP FUNCTION public.myfunc(integer);
+\endif
+
+-- last in 9.6 -- commit 5ded4bd21
+DROP FUNCTION IF EXISTS public.oldstyle_length(integer, text);
+DROP FUNCTION IF EXISTS public.putenv(text);
+
+\if :fromv13
+-- last in v13 commit 76f412ab3
+-- public.!=- This one is only needed for v11+ ??
+-- Note, until v10, operators could only be dropped one at a time
+DROP OPERATOR IF EXISTS public.#@# (pg_catalog.int8, NONE);
+DROP OPERATOR IF EXISTS public.#%# (pg_catalog.int8, NONE);
+DROP OPERATOR IF EXISTS public.!=- (pg_catalog.int8, NONE);
+DROP OPERATOR IF EXISTS public.#@%# (pg_catalog.int8, NONE);
+\endif
+
+\if :fromv10
+-- commit 068503c76511cdb0080bab689662a20e86b9c845
+DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;
+
+-- commit db3af9feb19f39827e916145f88fa5eca3130cb2
+DROP FUNCTION boxarea(box);
+DROP FUNCTION funny_dup17();
+
+-- commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+DROP TABLE abstime_tbl;
+DROP TABLE reltime_tbl;
+DROP TABLE tinterval_tbl;
+\endif
+
+\if :fromv96v13
+-- Various things removed for v14
+DROP AGGREGATE first_el_agg_any(anyelement);
+\endif
+
+\if :fromv95v13
+-- commit 9e38c2bb5 and 97f73a978
+-- DROP AGGREGATE array_larger_accum(anyarray);
+DROP AGGREGATE array_cat_accum(anyarray);
+
+-- commit 76f412ab3
+-- DROP OPERATOR @#@(bigint,NONE);
+DROP OPERATOR @#@(NONE,bigint);
+\endif
+
+-- \if :fromv84v11
+\if :fromv11
+-- commit 578b22971: OIDS removed in v12
+ALTER TABLE public.tenk1 SET WITHOUT OIDS;
+ALTER TABLE public.tenk1 SET WITHOUT OIDS;
+-- fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+ALTER TABLE public.emp SET WITHOUT OIDS;
+ALTER TABLE public.tt7 SET WITHOUT OIDS;
+\endif
+
+-- if [ "$newsrc" != "$oldsrc" ]; then
+-- 	# update references to old source tree's regress.so etc
+-- 	fix_sql=""
+-- 	case $oldpgversion in
+-- 		804??)
+-- 			fix_sql="UPDATE pg_proc SET probin = replace(probin::text, '$oldsrc', '$newsrc')::bytea WHERE probin LIKE '$oldsrc%';"
+-- 			;;
+-- 		*)
+-- 			fix_sql="UPDATE pg_proc SET probin = replace(probin, '$oldsrc', '$newsrc') WHERE probin LIKE '$oldsrc%';"
+-- 			;;
+-- 	esac
+-- 	psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
+--
+--	mv "$temp_root"/dump1.sql "$temp_root"/dump1.sql.orig
+-- 	sed "s;$oldsrc;$newsrc;g" "$temp_root"/dump1.sql.orig >"$temp_root"/dump1.sql
+-- fi
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 74c29229ac..a3df427f1d 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -178,101 +178,7 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 
 	# before dumping, get rid of objects not feasible in later versions
 	if [ "$newsrc" != "$oldsrc" ]; then
-		fix_sql=""
-		case $oldpgversion in
-			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer);"
-				;;
-		esac
-		fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.oldstyle_length(integer, text);"	# last in 9.6 -- commit 5ded4bd21
-		fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.putenv(text);"	# last in v13
-		# last in v13 commit 76f412ab3
-		# public.!=- This one is only needed for v11+ ??
-		# Note, until v10, operators could only be dropped one at a time
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.#@# (pg_catalog.int8, NONE);"
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.#%# (pg_catalog.int8, NONE);"
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.!=- (pg_catalog.int8, NONE);"
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.#@%# (pg_catalog.int8, NONE);"
-
-		# commit 068503c76511cdb0080bab689662a20e86b9c845
-		case $oldpgversion in
-			10????)
-				fix_sql="$fix_sql
-					DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
-				;;
-		esac
-
-		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
-		case $oldpgversion in
-			10????)
-				fix_sql="$fix_sql
-					DROP FUNCTION boxarea(box);"
-				fix_sql="$fix_sql
-					DROP FUNCTION funny_dup17();"
-				;;
-		esac
-
-		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
-		case $oldpgversion in
-			10????)
-				fix_sql="$fix_sql
-					DROP TABLE abstime_tbl;"
-				fix_sql="$fix_sql
-					DROP TABLE reltime_tbl;"
-				fix_sql="$fix_sql
-					DROP TABLE tinterval_tbl;"
-				;;
-		esac
-
-		# Various things removed for v14
-		case $oldpgversion in
-			906??|10????|11????|12????|13????)
-				fix_sql="$fix_sql
-					DROP AGGREGATE first_el_agg_any(anyelement);"
-				;;
-		esac
-		case $oldpgversion in
-			90[56]??|10????|11????|12????|13????)
-				# commit 9e38c2bb5 and 97f73a978
-				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
-				fix_sql="$fix_sql
-					DROP AGGREGATE array_cat_accum(anyarray);"
-
-				# commit 76f412ab3
-				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
-				fix_sql="$fix_sql
-					DROP OPERATOR @#@(NONE,bigint);"
-				;;
-		esac
-
-		# commit 578b22971: OIDS removed in v12
-		case $oldpgversion in
-			804??|9????|10????|11????)
-				fix_sql="$fix_sql
-					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
-				fix_sql="$fix_sql
-					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
-				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
-				fix_sql="$fix_sql
-					ALTER TABLE public.emp SET WITHOUT OIDS;"
-				fix_sql="$fix_sql
-					ALTER TABLE public.tt7 SET WITHOUT OIDS;"
-				;;
-		esac
-
-		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
+		psql -X -d regression -f "test-upgrade.sql" || psql_fix_sql_status=$?
 	fi
 
 	echo "fix_sql: $oldpgversion: $fix_sql" >&2
-- 
2.17.0

From 01debb48fe424e94cd2533d062c828ee6308d3c9 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 22:31:19 -0600
Subject: [PATCH v5 1/4] WIP: pg_upgrade/test.sh: changes needed to allow
 testing upgrade to v14dev from v9.5-v13

test like:
time make -C src/bin/pg_upgrade check oldsrc=`pwd`/11 oldbindir=`pwd`/11/tmp_install/usr/local/pgsql/bin
---
 src/bin/pg_upgrade/test.sh | 93 +++++++++++++++++++++++++++++++++++---
 1 file changed, 86 insertions(+), 7 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 1ba326decd..9288cfdda8 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -176,18 +176,97 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 		esac
 		fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
-					public.oldstyle_length(integer, text);	-- last in 9.6
+					public.oldstyle_length(integer, text);"	# last in 9.6 -- commit 5ded4bd21
+		fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
-					public.putenv(text);	-- last in v13
-				 DROP OPERATOR IF EXISTS	-- last in v13
-					public.#@# (pg_catalog.int8, NONE),
-					public.#%# (pg_catalog.int8, NONE),
-					public.!=- (pg_catalog.int8, NONE),
+					public.putenv(text);"	# last in v13
+		# last in v13 commit 76f412ab3
+		# public.!=- This one is only needed for v11+ ??
+		# Note, until v10, operators could only be dropped one at a time
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.#@# (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.#%# (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
+					public.!=- (pg_catalog.int8, NONE);"
+		fix_sql="$fix_sql
+				 DROP OPERATOR IF EXISTS
 					public.#@%# (pg_catalog.int8, NONE);"
+
+		# commit 068503c76511cdb0080bab689662a20e86b9c845
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
+				;;
+		esac
+
+		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP FUNCTION boxarea(box);"
+				fix_sql="$fix_sql
+					DROP FUNCTION funny_dup17();"
+				;;
+		esac
+
+		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+		case $oldpgversion in
+			10????)
+				fix_sql="$fix_sql
+					DROP TABLE abstime_tbl;"
+				fix_sql="$fix_sql
+					DROP TABLE reltime_tbl;"
+				fix_sql="$fix_sql
+					DROP TABLE tinterval_tbl;"
+				;;
+		esac
+
+		# Various things removed for v14
+		case $oldpgversion in
+			906??|10????|11????|12????|13????)
+				fix_sql="$fix_sql
+					DROP AGGREGATE first_el_agg_any(anyelement);"
+				;;
+		esac
+		case $oldpgversion in
+			90[56]??|10????|11????|12????|13????)
+				# commit 9e38c2bb5 and 97f73a978
+				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
+				fix_sql="$fix_sql
+					DROP AGGREGATE array_cat_accum(anyarray);"
+
+				# commit 76f412ab3
+				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
+				fix_sql="$fix_sql
+					DROP OPERATOR @#@(NONE,bigint);"
+				;;
+		esac
+
+		# commit 578b22971: OIDS removed in v12
+		case $oldpgversion in
+			804??|9????|10????|11????)
+				fix_sql="$fix_sql
+					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				fix_sql="$fix_sql
+					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
+				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+				fix_sql="$fix_sql
+					ALTER TABLE public.emp SET WITHOUT OIDS;"
+				fix_sql="$fix_sql
+					ALTER TABLE public.tt7 SET WITHOUT OIDS;"
+				;;
+		esac
+
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	echo "fix_sql: $oldpgversion: $fix_sql" >&2
+	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
-- 
2.17.0

From 8f39f5b66bae4994e022008a90356b3a36466833 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 11 Jan 2021 21:41:16 -0600
Subject: [PATCH v5 2/4] More changes needed to allow upgrade testing:

These all seem to complicate use of pg_upgrade/test.sh:

e78900afd217fa3eaa77c51e23a94c1466af421c Create by default sql/ and expected/ for output directory in pg_regress
40b132c1afbb4b1494aa8e48cc35ec98d2b90777 In the pg_upgrade test suite, don't write to src/test/regress.
fc49e24fa69a15efacd5b8958115ed9c43c48f9a Make WAL segment size configurable at initdb time.
c37b3d08ca6873f9d4eaf24c72a90a550970cbb8 Allow group access on PGDATA
da9b580d89903fee871cf54845ffa2b26bda2e11 Refactor dir/file permissions
---
 src/bin/pg_upgrade/test.sh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 9288cfdda8..2bdd8c19de 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,13 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	if [ -z "$oldsrc" ]
+	then
+		"$1" -N -A trust --wal-segsize 1 -g
+	else
+		"$1" -N -A trust
+	fi
+
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -106,6 +112,9 @@ outputdir="$temp_root/regress"
 EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --outputdir=$outputdir"
 export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
+mkdir "$outputdir"/testtablespace
+mkdir "$outputdir"/sql
+mkdir "$outputdir"/expected
 
 logdir=`pwd`/log
 rm -rf "$logdir"
@@ -312,23 +321,29 @@ pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -p "
 # Windows hosts don't support Unix-y permissions.
 case $testhost in
 	MINGW*|CYGWIN*) ;;
-	*)	if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
-			echo "files in PGDATA with permission != 640";
+	*)
+		x=`find "$PGDATA" -type f ! -perm 600 ! -perm 640 -ls`
+		if [ -n "$x" ]; then
+			echo "files in PGDATA with permission NOT IN (600, 640)";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 case $testhost in
 	MINGW*|CYGWIN*) ;;
-	*)	if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
-			echo "directories in PGDATA with permission != 750";
+	*)
+		x=`find "$PGDATA" -type d ! -perm 700 ! -perm 750 -ls`
+		if [ "$x" ]; then
+			echo "directories in PGDATA with permission NOT IN (700, 750)";
+			echo "$x" |head
 			exit 1;
 		fi ;;
 esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then
-- 
2.17.0

From 9e710615e610f055de9ae4675704fd7429dd8155 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 6 Mar 2021 18:35:26 -0600
Subject: [PATCH v5 4/4] Move pg_upgrade kludges to sql script

---
 src/bin/pg_upgrade/test-upgrade.sql | 70 +++++++++++++++++++++
 src/bin/pg_upgrade/test.sh          | 97 +----------------------------
 2 files changed, 71 insertions(+), 96 deletions(-)
 create mode 100644 src/bin/pg_upgrade/test-upgrade.sql

diff --git a/src/bin/pg_upgrade/test-upgrade.sql b/src/bin/pg_upgrade/test-upgrade.sql
new file mode 100644
index 0000000000..8c7cceb211
--- /dev/null
+++ b/src/bin/pg_upgrade/test-upgrade.sql
@@ -0,0 +1,70 @@
+-- This file has a bunch of kludges needed for testing upgrades across major versions
+
+SELECT
+	ver >= 804 AND ver <= 1100 AS oldpgversion_84_11,
+	ver >= 905 AND ver <= 1300 AS oldpgversion_95_13,
+	ver >= 906 AND ver <= 1300 AS oldpgversion_96_13,
+	ver >= 906 AND ver <= 1000 AS oldpgversion_96_10,
+	ver >= 1000 AS oldpgversion_ge10,
+	ver <= 804 AS oldpgversion_le84,
+	ver <= 1300 AS oldpgversion_le13
+	FROM (SELECT current_setting('server_version_num')::int/100 AS ver) AS v;
+\gset
+
+\if :oldpgversion_le84
+DROP FUNCTION public.myfunc(integer);
+\endif
+
+-- last in 9.6 -- commit 5ded4bd21
+DROP FUNCTION IF EXISTS public.oldstyle_length(integer, text);
+DROP FUNCTION IF EXISTS public.putenv(text);
+
+\if :oldpgversion_le13
+-- last in v13 commit 76f412ab3
+-- public.!=- This one is only needed for v11+ ??
+-- Note, until v10, operators could only be dropped one at a time
+DROP OPERATOR IF EXISTS public.#@# (pg_catalog.int8, NONE);
+DROP OPERATOR IF EXISTS public.#%# (pg_catalog.int8, NONE);
+DROP OPERATOR IF EXISTS public.!=- (pg_catalog.int8, NONE);
+DROP OPERATOR IF EXISTS public.#@%# (pg_catalog.int8, NONE);
+\endif
+
+\if :oldpgversion_ge10
+-- commit 068503c76511cdb0080bab689662a20e86b9c845
+DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;
+\endif
+
+\if :oldpgversion_96_10
+-- commit db3af9feb19f39827e916145f88fa5eca3130cb2
+DROP FUNCTION boxarea(box);
+DROP FUNCTION funny_dup17();
+
+-- commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+DROP TABLE abstime_tbl;
+DROP TABLE reltime_tbl;
+DROP TABLE tinterval_tbl;
+\endif
+
+\if :oldpgversion_96_13
+-- Various things removed for v14
+DROP AGGREGATE first_el_agg_any(anyelement);
+\endif
+
+\if :oldpgversion_95_13
+-- commit 9e38c2bb5 and 97f73a978
+-- DROP AGGREGATE array_larger_accum(anyarray);
+DROP AGGREGATE array_cat_accum(anyarray);
+
+-- commit 76f412ab3
+-- DROP OPERATOR @#@(bigint,NONE);
+DROP OPERATOR @#@(NONE,bigint);
+\endif
+
+\if :oldpgversion_84_11
+-- commit 578b22971: OIDS removed in v12
+ALTER TABLE public.tenk1 SET WITHOUT OIDS;
+ALTER TABLE public.tenk1 SET WITHOUT OIDS;
+-- fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
+ALTER TABLE public.emp SET WITHOUT OIDS;
+ALTER TABLE public.tt7 SET WITHOUT OIDS;
+\endif
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 2bdd8c19de..61bcca3673 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -177,104 +177,9 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 
 	# before dumping, get rid of objects not feasible in later versions
 	if [ "$newsrc" != "$oldsrc" ]; then
-		fix_sql=""
-		case $oldpgversion in
-			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer);"
-				;;
-		esac
-		fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.oldstyle_length(integer, text);"	# last in 9.6 -- commit 5ded4bd21
-		fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.putenv(text);"	# last in v13
-		# last in v13 commit 76f412ab3
-		# public.!=- This one is only needed for v11+ ??
-		# Note, until v10, operators could only be dropped one at a time
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.#@# (pg_catalog.int8, NONE);"
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.#%# (pg_catalog.int8, NONE);"
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.!=- (pg_catalog.int8, NONE);"
-		fix_sql="$fix_sql
-				 DROP OPERATOR IF EXISTS
-					public.#@%# (pg_catalog.int8, NONE);"
-
-		# commit 068503c76511cdb0080bab689662a20e86b9c845
-		case $oldpgversion in
-			10????)
-				fix_sql="$fix_sql
-					DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;"
-				;;
-		esac
-
-		# commit db3af9feb19f39827e916145f88fa5eca3130cb2
-		case $oldpgversion in
-			10????)
-				fix_sql="$fix_sql
-					DROP FUNCTION boxarea(box);"
-				fix_sql="$fix_sql
-					DROP FUNCTION funny_dup17();"
-				;;
-		esac
-
-		# commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
-		case $oldpgversion in
-			10????)
-				fix_sql="$fix_sql
-					DROP TABLE abstime_tbl;"
-				fix_sql="$fix_sql
-					DROP TABLE reltime_tbl;"
-				fix_sql="$fix_sql
-					DROP TABLE tinterval_tbl;"
-				;;
-		esac
-
-		# Various things removed for v14
-		case $oldpgversion in
-			906??|10????|11????|12????|13????)
-				fix_sql="$fix_sql
-					DROP AGGREGATE first_el_agg_any(anyelement);"
-				;;
-		esac
-		case $oldpgversion in
-			90[56]??|10????|11????|12????|13????)
-				# commit 9e38c2bb5 and 97f73a978
-				# fix_sql="$fix_sql DROP AGGREGATE array_larger_accum(anyarray);"
-				fix_sql="$fix_sql
-					DROP AGGREGATE array_cat_accum(anyarray);"
-
-				# commit 76f412ab3
-				#fix_sql="$fix_sql DROP OPERATOR @#@(bigint,NONE);"
-				fix_sql="$fix_sql
-					DROP OPERATOR @#@(NONE,bigint);"
-				;;
-		esac
-
-		# commit 578b22971: OIDS removed in v12
-		case $oldpgversion in
-			804??|9????|10????|11????)
-				fix_sql="$fix_sql
-					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
-				fix_sql="$fix_sql
-					ALTER TABLE public.tenk1 SET WITHOUT OIDS;"
-				#fix_sql="$fix_sql ALTER TABLE public.stud_emp SET WITHOUT OIDS;" # inherited
-				fix_sql="$fix_sql
-					ALTER TABLE public.emp SET WITHOUT OIDS;"
-				fix_sql="$fix_sql
-					ALTER TABLE public.tt7 SET WITHOUT OIDS;"
-				;;
-		esac
-
-		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
+		psql -X -d regression -f "test-upgrade.sql" || psql_fix_sql_status=$?
 	fi
 
-	echo "fix_sql: $oldpgversion: $fix_sql" >&2
 	pg_dumpall --extra-float-digits=0 --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
-- 
2.17.0

From 8a7a2ac9aa73f06a2b3d413fc3712677012ae88a Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH v5 3/4] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes to notice if the
binary format is accidentally changed again, as happened at:
7c15cef86 Base information_schema.sql_identifier domain on name, not varchar.

I checked that if I cherry-pick to v11, and comment out
old_11_check_for_sql_identifier_data_type_usage(), then pg_upgrade/test.sh
detects the original problem:
pg_dump: error: Error message from server: ERROR:  invalid memory alloc request size 18446744073709551613

I understand the buildfarm has its own cross-version-upgrade test, which I
think would catch this on its own.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 55 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 54 +++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 982b6aff53..551f35d59f 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index f567fd378e..58013a8df3 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -674,3 +674,58 @@ WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
 ----------+------------+---------------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'foo'::"char", 'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type, 'pg_monitor'::regrole,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot, '16/B374D848'::pg_lsn,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no,
+'venus'::planets, 'i16'::insenum,
+'(1,2)'::int4range, '{(1,2)}'::int4multirange,
+'(3,4)'::int8range, '{(3,4)}'::int8multirange,
+'(1,2)'::float8range, '{(1,2)}'::float8multirange,
+'(3,4)'::numrange, '{(3,4)}'::nummultirange,
+'(a,b)'::textrange, '{(a,b)}'::textmultirange,
+'(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+'(2020-01-02, 2021-02-03)'::daterange,
+'{(2020-01-02, 2021-02-03)}'::datemultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+arrayrange(ARRAY[1,2], ARRAY[2,1]),
+arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+-- And now a test on the previous test, checking that all core types are
+-- included in this table
+-- XXX or some other non-catalog table processed by pg_upgrade
+SELECT oid, typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typtype NOT IN ('p', 'c')
+-- reg* which cannot be pg_upgraded
+AND oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper', 'regoperator', 'regconfig', 'regdictionary', 'regnamespace', 'regcollation']::regtype[])
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['xml', 'gtsvector', 'pg_node_tree', 'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list', 'pg_brin_bloom_summary', 'pg_brin_minmax_multi_summary']::regtype[])
+AND NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray=t.oid) -- exclude arrays
+AND NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
+ oid | typname | typtype | typelem | typarray | typarray 
+-----+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 404c3a2043..e98191f01f 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -495,3 +495,57 @@ WHERE pronargs != 2
 SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
 FROM pg_range p1
 WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'foo'::"char", 'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type, 'pg_monitor'::regrole,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot, '16/B374D848'::pg_lsn,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no,
+'venus'::planets, 'i16'::insenum,
+'(1,2)'::int4range, '{(1,2)}'::int4multirange,
+'(3,4)'::int8range, '{(3,4)}'::int8multirange,
+'(1,2)'::float8range, '{(1,2)}'::float8multirange,
+'(3,4)'::numrange, '{(3,4)}'::nummultirange,
+'(a,b)'::textrange, '{(a,b)}'::textmultirange,
+'(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+'(2020-01-02, 2021-02-03)'::daterange,
+'{(2020-01-02, 2021-02-03)}'::datemultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+arrayrange(ARRAY[1,2], ARRAY[2,1]),
+arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table
+-- XXX or some other non-catalog table processed by pg_upgrade
+SELECT oid, typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typtype NOT IN ('p', 'c')
+-- reg* which cannot be pg_upgraded
+AND oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper', 'regoperator', 'regconfig', 'regdictionary', 'regnamespace', 'regcollation']::regtype[])
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['xml', 'gtsvector', 'pg_node_tree', 'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list', 'pg_brin_bloom_summary', 'pg_brin_minmax_multi_summary']::regtype[])
+AND NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray=t.oid) -- exclude arrays
+AND NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
-- 
2.17.0

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL9_4_STABLE.sql.fixed	2021-09-12 16:03:15.842096983 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL9_4_STABLE-to-HEAD.sql.fixed	2021-09-12 16:03:15.861096984 -0400
@@ -62,9 +62,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -1616,9 +1616,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -8749,9 +8749,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -9592,9 +9592,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -28059,9 +28059,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -28401,9 +28401,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31641,9 +31641,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31746,9 +31744,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31851,9 +31847,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31963,9 +31959,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32054,9 +32048,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32145,9 +32137,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -33357,9 +33349,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -33448,9 +33438,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35613,9 +35603,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36776,9 +36766,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36937,9 +36927,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -37079,9 +37069,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -37257,9 +37247,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -38171,9 +38159,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -40882,9 +40870,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41202,9 +41190,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41320,9 +41306,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41425,9 +41409,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41530,9 +41512,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41703,9 +41683,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41794,9 +41772,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43238,9 +43216,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -44121,9 +44099,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -45078,9 +45056,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -45125,9 +45101,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -45248,7 +45222,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -45271,7 +45246,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -45358,6 +45334,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -45405,6 +45382,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -45874,6 +45852,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -50638,7 +50619,7 @@
     x integer,
     y text,
     z integer,
-    CONSTRAINT sequence_con CHECK ((((x > 3) AND (y <> 'check failed'::text)) AND (z < 8)))
+    CONSTRAINT sequence_con CHECK (((x > 3) AND (y <> 'check failed'::text) AND (z < 8)))
 );
 
 
@@ -50781,7 +50762,7 @@
     x integer,
     y text,
     z integer,
-    CONSTRAINT copy_con CHECK ((((x > 3) AND (y <> 'check failed'::text)) AND (x < 7)))
+    CONSTRAINT copy_con CHECK (((x > 3) AND (y <> 'check failed'::text) AND (x < 7)))
 );
 
 
@@ -51377,8 +51358,8 @@
 CREATE TABLE public.insert_tbl (
     x integer DEFAULT nextval('public.insert_seq'::regclass),
     y text DEFAULT '-NULL-'::text,
-    z integer DEFAULT ((-1) * currval('public.insert_seq'::regclass)),
-    CONSTRAINT insert_con CHECK ((((x >= 3) AND (y <> 'check failed'::text)) AND (x < 8))),
+    z integer DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass)),
+    CONSTRAINT insert_con CHECK (((x >= 3) AND (y <> 'check failed'::text) AND (x < 8))),
     CONSTRAINT insert_tbl_check CHECK (((x + z) = 0))
 );
 
@@ -52799,7 +52780,7 @@
     int4smaller(rsh.sh_avail, rsl.sl_avail) AS total_avail
    FROM public.shoe rsh,
     public.shoelace rsl
-  WHERE (((rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)) AND (rsl.sl_len_cm <= rsh.slmaxlen_cm));
+  WHERE ((rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm) AND (rsl.sl_len_cm <= rsh.slmaxlen_cm));
 
 
 ALTER TABLE public.shoe_ready OWNER TO buildfarm;
@@ -223090,9 +223071,9 @@
 --
 
 COPY public.test_tsquery (txtkeyword, txtsample, keyword, sample) FROM stdin;
-'New York'	new & york | big & apple | nyc	'new' & 'york'	( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'
+'New York'	new & york | big & apple | nyc	'new' & 'york'	'new' & 'york' | 'big' & 'appl' | 'nyc'
 Moscow	moskva | moscow	'moscow'	'moskva' | 'moscow'
-'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	'peterburg' | 'peter' | 'sanct' & 'peterburg'
 'foo bar qq'	foo & (bar | qq) & city	'foo' & 'bar' & 'qq'	'foo' & ( 'bar' | 'qq' ) & 'citi'
 \.
 
@@ -226085,8 +226066,8 @@
     ON INSERT TO public.rule_and_refint_t3
    WHERE (EXISTS ( SELECT 1
            FROM public.rule_and_refint_t3 rule_and_refint_t3_1
-          WHERE (((rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)) AND (rule_and_refint_t3_1.id3c = new.id3c)))) DO INSTEAD  UPDATE public.rule_and_refint_t3 SET data = new.data
-  WHERE (((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)) AND (rule_and_refint_t3.id3c = new.id3c));
+          WHERE ((rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b) AND (rule_and_refint_t3_1.id3c = new.id3c)))) DO INSTEAD  UPDATE public.rule_and_refint_t3 SET data = new.data
+  WHERE ((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b) AND (rule_and_refint_t3.id3c = new.id3c));
 
 
 --
@@ -226488,22 +226469,10 @@
 
 
 --
--- Name: DATABASE regression; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON DATABASE regression FROM PUBLIC;
-REVOKE ALL ON DATABASE regression FROM buildfarm;
-GRANT ALL ON DATABASE regression TO buildfarm;
-GRANT CONNECT,TEMPORARY ON DATABASE regression TO PUBLIC;
-
-
---
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -226511,9 +226480,6 @@
 -- Name: TABLE my_credit_card_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_normal TO PUBLIC;
 
 
@@ -226521,9 +226487,6 @@
 -- Name: TABLE my_credit_card_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_secure TO PUBLIC;
 
 
@@ -226531,9 +226494,6 @@
 -- Name: TABLE my_credit_card_usage_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_normal TO PUBLIC;
 
 
@@ -226541,9 +226501,6 @@
 -- Name: TABLE my_credit_card_usage_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_secure TO PUBLIC;
 
 
@@ -226551,9 +226508,6 @@
 -- Name: TABLE my_property_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_normal TO PUBLIC;
 
 
@@ -226561,9 +226515,6 @@
 -- Name: TABLE my_property_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_secure TO PUBLIC;
 
 

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL9_5_STABLE.sql.fixed	2021-09-12 16:04:40.281098310 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL9_5_STABLE-to-HEAD.sql.fixed	2021-09-12 16:04:40.306098310 -0400
@@ -66,9 +66,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -7199,9 +7199,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -8042,9 +8042,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -26509,9 +26509,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -26851,9 +26851,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -26949,9 +26947,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30182,9 +30180,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30416,13 +30414,25 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
 --
+-- Name: FUNCTION dblink_connect_u(text); Type: ACL; Schema: public; Owner: buildfarm
+--
+
+REVOKE ALL ON FUNCTION public.dblink_connect_u(text) FROM PUBLIC;
+
+
+--
+-- Name: FUNCTION dblink_connect_u(text, text); Type: ACL; Schema: public; Owner: buildfarm
+--
+
+REVOKE ALL ON FUNCTION public.dblink_connect_u(text, text) FROM PUBLIC;
+
+
+--
 -- PostgreSQL database dump complete
 --
 
@@ -30521,9 +30531,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30626,9 +30634,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30870,9 +30878,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30982,9 +30990,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31073,9 +31079,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31164,9 +31168,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32376,9 +32380,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32467,9 +32469,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32770,9 +32772,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32861,9 +32861,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35026,9 +35026,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35228,9 +35226,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36391,9 +36389,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36552,9 +36550,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36694,9 +36692,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36872,9 +36870,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39062,9 +39060,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39976,9 +39972,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -42687,9 +42683,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43007,9 +43003,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43125,9 +43119,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43216,9 +43208,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43321,9 +43311,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43490,9 +43480,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43660,9 +43650,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43765,9 +43753,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -43938,9 +43924,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -44029,9 +44013,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -45473,9 +45457,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -46368,9 +46352,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -47325,9 +47309,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -47372,9 +47354,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -47511,7 +47491,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -47534,7 +47515,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -47621,6 +47603,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -47668,6 +47651,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -48194,6 +48178,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -249867,9 +249854,9 @@
 --
 
 COPY public.test_tsquery (txtkeyword, txtsample, keyword, sample) FROM stdin;
-'New York'	new & york | big & apple | nyc	'new' & 'york'	( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'
+'New York'	new & york | big & apple | nyc	'new' & 'york'	'new' & 'york' | 'big' & 'appl' | 'nyc'
 Moscow	moskva | moscow	'moscow'	'moskva' | 'moscow'
-'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	'peterburg' | 'peter' | 'sanct' & 'peterburg'
 'foo bar qq'	foo & (bar | qq) & city	'foo' & 'bar' & 'qq'	'foo' & ( 'bar' | 'qq' ) & 'citi'
 \.
 
@@ -253535,22 +253522,10 @@
 ALTER TABLE rls_regress_schema.rls_tbl_force ENABLE ROW LEVEL SECURITY;
 
 --
--- Name: DATABASE regression; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON DATABASE regression FROM PUBLIC;
-REVOKE ALL ON DATABASE regression FROM buildfarm;
-GRANT ALL ON DATABASE regression TO buildfarm;
-GRANT CONNECT,TEMPORARY ON DATABASE regression TO PUBLIC;
-
-
---
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -253558,9 +253533,6 @@
 -- Name: TABLE my_credit_card_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_normal TO PUBLIC;
 
 
@@ -253568,9 +253540,6 @@
 -- Name: TABLE my_credit_card_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_secure TO PUBLIC;
 
 
@@ -253578,9 +253547,6 @@
 -- Name: TABLE my_credit_card_usage_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_normal TO PUBLIC;
 
 
@@ -253588,9 +253554,6 @@
 -- Name: TABLE my_credit_card_usage_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_secure TO PUBLIC;
 
 
@@ -253598,9 +253561,6 @@
 -- Name: TABLE my_property_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_normal TO PUBLIC;
 
 
@@ -253608,9 +253568,6 @@
 -- Name: TABLE my_property_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_secure TO PUBLIC;
 
 

diff --git a/PGBuild/Modules/TestUpgradeXversion.pm b/PGBuild/Modules/TestUpgradeXversion.pm
index 79c24c4..8aed93c 100644
--- a/PGBuild/Modules/TestUpgradeXversion.pm
+++ b/PGBuild/Modules/TestUpgradeXversion.pm
@@ -689,9 +689,26 @@ sub test_upgrade    ## no critic (Subroutines::ProhibitManyArgs)
 		return if $?;
 	}
 
-	system( qq{diff -I "^-- " -u "$upgrade_loc/origin-$oversion.sql" }
-		  . qq{"$upgrade_loc/converted-$oversion-to-$this_branch.sql" }
-		  . qq{> "$upgrade_loc/dumpdiff-$oversion" 2>&1});
+	foreach my $dump ("$upgrade_loc/origin-$oversion.sql",
+					 "$upgrade_loc/converted-$oversion-to-$this_branch.sql")
+	{
+		# would like to use lookbehind here but perl complains
+		# so do it this way
+		my $contents = file_contents($dump);
+		$contents =~ s/
+                         (^CREATE\sTRIGGER\s.*?)
+                         \sEXECUTE\sPROCEDURE
+                      /$1 EXECUTE FUNCTION/mgx;
+		open(my $dh, '>', "$dump.fixed") || die "opening $dump.fixed";
+		print $dh $contents;
+		close($dh);
+	}
+
+	system( qq{diff -I "^\$" -I "SET default_table_access_method = heap;" }
+		. qq{ -I "^SET default_toast_compression = 'pglz';\$" -I "^-- " }
+		. qq{-u "$upgrade_loc/origin-$oversion.sql.fixed" }
+		. qq{"$upgrade_loc/converted-$oversion-to-$this_branch.sql.fixed" }
+		. qq{> "$upgrade_loc/dumpdiff-$oversion" 2>&1});
 
 	# diff exits with status 1 if files differ
 	return if $? >> 8 > 1;
@@ -699,7 +716,10 @@ sub test_upgrade    ## no critic (Subroutines::ProhibitManyArgs)
 	open(my $diffile, '<', "$upgrade_loc/dumpdiff-$oversion")
 	  || die "opening $upgrade_loc/dumpdiff-$oversion: $!";
 	my $difflines = 0;
-	$difflines++ while <$diffile>;
+	while (<$diffile>)
+	{
+		$difflines++ if /^[+-]/;
+	}
 	close($diffile);
 
 	# If the versions match we expect a possible handful of diffs,

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL9_2_STABLE.sql.fixed	2021-09-12 16:01:18.046095133 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL9_2_STABLE-to-HEAD.sql.fixed	2021-09-12 16:01:18.064095134 -0400
@@ -62,9 +62,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -283,10 +283,6 @@
 -- Name: DATABASE contrib_regression; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON DATABASE contrib_regression FROM PUBLIC;
-REVOKE ALL ON DATABASE contrib_regression FROM buildfarm;
-GRANT ALL ON DATABASE contrib_regression TO buildfarm;
-GRANT CONNECT,TEMPORARY ON DATABASE contrib_regression TO PUBLIC;
 GRANT ALL ON DATABASE contrib_regression TO dblink_regression_test;
 
 
@@ -294,13 +290,25 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
 --
+-- Name: FUNCTION dblink_connect_u(text); Type: ACL; Schema: public; Owner: buildfarm
+--
+
+REVOKE ALL ON FUNCTION public.dblink_connect_u(text) FROM PUBLIC;
+
+
+--
+-- Name: FUNCTION dblink_connect_u(text, text); Type: ACL; Schema: public; Owner: buildfarm
+--
+
+REVOKE ALL ON FUNCTION public.dblink_connect_u(text, text) FROM PUBLIC;
+
+
+--
 -- PostgreSQL database dump complete
 --
 
@@ -7427,9 +7437,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -8270,9 +8280,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -26737,9 +26747,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -26991,9 +27001,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30224,9 +30234,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30329,9 +30337,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30434,9 +30440,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30546,9 +30552,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30637,9 +30641,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -30728,9 +30730,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31918,9 +31920,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -32009,9 +32009,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -34174,9 +34174,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35335,9 +35335,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35496,9 +35496,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35630,9 +35630,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35808,9 +35808,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36374,9 +36372,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39085,9 +39083,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39405,9 +39403,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39523,9 +39519,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39628,9 +39622,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -39719,9 +39711,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -40548,7 +40540,9 @@
 --
 
 CREATE VIEW public.trigger_test_view AS
-SELECT trigger_test.i, trigger_test.v FROM public.trigger_test;
+ SELECT trigger_test.i,
+    trigger_test.v
+   FROM public.trigger_test;
 
 
 ALTER TABLE public.trigger_test_view OWNER TO buildfarm;
@@ -40661,9 +40655,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -40708,9 +40700,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -40822,7 +40812,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -40845,7 +40836,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -40932,6 +40924,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -40979,6 +40972,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -41377,6 +41371,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -45617,7 +45614,7 @@
     x integer,
     y text,
     z integer,
-    CONSTRAINT sequence_con CHECK ((((x > 3) AND (y <> 'check failed'::text)) AND (z < 8)))
+    CONSTRAINT sequence_con CHECK (((x > 3) AND (y <> 'check failed'::text) AND (z < 8)))
 );
 
 
@@ -45760,7 +45757,7 @@
     x integer,
     y text,
     z integer,
-    CONSTRAINT copy_con CHECK ((((x > 3) AND (y <> 'check failed'::text)) AND (x < 7)))
+    CONSTRAINT copy_con CHECK (((x > 3) AND (y <> 'check failed'::text) AND (x < 7)))
 );
 
 
@@ -45975,7 +45972,8 @@
 --
 
 CREATE VIEW public.domview AS
-SELECT (domtab.col1)::public.dom AS col1 FROM public.domtab;
+ SELECT (domtab.col1)::public.dom AS col1
+   FROM public.domtab;
 
 
 ALTER TABLE public.domview OWNER TO buildfarm;
@@ -46262,7 +46260,12 @@
 --
 
 CREATE VIEW public.iexit AS
-SELECT ih.name, ih.thepath, public.interpt_pp(ih.thepath, r.thepath) AS exit FROM public.ihighway ih, public.ramp r WHERE (ih.thepath OPERATOR(public.##) r.thepath);
+ SELECT ih.name,
+    ih.thepath,
+    public.interpt_pp(ih.thepath, r.thepath) AS exit
+   FROM public.ihighway ih,
+    public.ramp r
+  WHERE (ih.thepath OPERATOR(public.##) r.thepath);
 
 
 ALTER TABLE public.iexit OWNER TO buildfarm;
@@ -46337,8 +46340,8 @@
 CREATE TABLE public.insert_tbl (
     x integer DEFAULT nextval('public.insert_seq'::regclass),
     y text DEFAULT '-NULL-'::text,
-    z integer DEFAULT ((-1) * currval('public.insert_seq'::regclass)),
-    CONSTRAINT insert_con CHECK ((((x >= 3) AND (y <> 'check failed'::text)) AND (x < 8))),
+    z integer DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass)),
+    CONSTRAINT insert_con CHECK (((x >= 3) AND (y <> 'check failed'::text) AND (x < 8))),
     CONSTRAINT insert_tbl_check CHECK (((x + z) = 0))
 );
 
@@ -46487,7 +46490,15 @@
 --
 
 CREATE VIEW public.my_credit_card_normal AS
-SELECT l.cid, l.name, l.tel, l.passwd, r.cnum, r.climit FROM (public.customer l NATURAL JOIN public.credit_card r) WHERE (l.name = ("current_user"())::text);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    r.cnum,
+    r.climit
+   FROM (public.customer l
+     JOIN public.credit_card r USING (cid))
+  WHERE (l.name = ("current_user"())::text);
 
 
 ALTER TABLE public.my_credit_card_normal OWNER TO buildfarm;
@@ -46497,7 +46508,15 @@
 --
 
 CREATE VIEW public.my_credit_card_secure WITH (security_barrier='true') AS
-SELECT l.cid, l.name, l.tel, l.passwd, r.cnum, r.climit FROM (public.customer l NATURAL JOIN public.credit_card r) WHERE (l.name = ("current_user"())::text);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    r.cnum,
+    r.climit
+   FROM (public.customer l
+     JOIN public.credit_card r USING (cid))
+  WHERE (l.name = ("current_user"())::text);
 
 
 ALTER TABLE public.my_credit_card_secure OWNER TO buildfarm;
@@ -46507,7 +46526,16 @@
 --
 
 CREATE VIEW public.my_credit_card_usage_normal AS
-SELECT l.cid, l.name, l.tel, l.passwd, l.cnum, l.climit, r.ymd, r.usage FROM (public.my_credit_card_secure l NATURAL JOIN public.credit_usage r);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    l.cnum,
+    l.climit,
+    r.ymd,
+    r.usage
+   FROM (public.my_credit_card_secure l
+     JOIN public.credit_usage r USING (cid));
 
 
 ALTER TABLE public.my_credit_card_usage_normal OWNER TO buildfarm;
@@ -46517,7 +46545,16 @@
 --
 
 CREATE VIEW public.my_credit_card_usage_secure WITH (security_barrier='true') AS
-SELECT l.cid, l.name, l.tel, l.passwd, l.cnum, l.climit, r.ymd, r.usage FROM (public.my_credit_card_secure l NATURAL JOIN public.credit_usage r);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    l.cnum,
+    l.climit,
+    r.ymd,
+    r.usage
+   FROM (public.my_credit_card_secure l
+     JOIN public.credit_usage r USING (cid));
 
 
 ALTER TABLE public.my_credit_card_usage_secure OWNER TO buildfarm;
@@ -46527,7 +46564,12 @@
 --
 
 CREATE VIEW public.my_property_normal WITH (security_barrier='true') AS
-SELECT customer.cid, customer.name, customer.tel, customer.passwd FROM public.customer WHERE (customer.name = ("current_user"())::text);
+ SELECT customer.cid,
+    customer.name,
+    customer.tel,
+    customer.passwd
+   FROM public.customer
+  WHERE (customer.name = ("current_user"())::text);
 
 
 ALTER TABLE public.my_property_normal OWNER TO buildfarm;
@@ -46537,7 +46579,12 @@
 --
 
 CREATE VIEW public.my_property_secure WITH (security_barrier='false') AS
-SELECT customer.cid, customer.name, customer.tel, customer.passwd FROM public.customer WHERE (customer.name = ("current_user"())::text);
+ SELECT customer.cid,
+    customer.name,
+    customer.tel,
+    customer.passwd
+   FROM public.customer
+  WHERE (customer.name = ("current_user"())::text);
 
 
 ALTER TABLE public.my_property_secure OWNER TO buildfarm;
@@ -46830,7 +46877,11 @@
 --
 
 CREATE VIEW public.pfield_v1 AS
-SELECT pf.pfname, pf.slotname, public.pslot_backlink_view(pf.slotname) AS backside, public.pslot_slotlink_view(pf.slotname) AS patch FROM public.pslot pf;
+ SELECT pf.pfname,
+    pf.slotname,
+    public.pslot_backlink_view(pf.slotname) AS backside,
+    public.pslot_slotlink_view(pf.slotname) AS patch
+   FROM public.pslot pf;
 
 
 ALTER TABLE public.pfield_v1 OWNER TO buildfarm;
@@ -47301,7 +47352,9 @@
 --
 
 CREATE VIEW public.rtest_v1 AS
-SELECT rtest_t1.a, rtest_t1.b FROM public.rtest_t1;
+ SELECT rtest_t1.a,
+    rtest_t1.b
+   FROM public.rtest_t1;
 
 
 ALTER TABLE public.rtest_v1 OWNER TO buildfarm;
@@ -47311,7 +47364,11 @@
 --
 
 CREATE VIEW public.rtest_vcomp AS
-SELECT x.part, (x.size * y.factor) AS size_in_cm FROM public.rtest_comp x, public.rtest_unitfact y WHERE (x.unit = y.unit);
+ SELECT x.part,
+    (x.size * y.factor) AS size_in_cm
+   FROM public.rtest_comp x,
+    public.rtest_unitfact y
+  WHERE (x.unit = y.unit);
 
 
 ALTER TABLE public.rtest_vcomp OWNER TO buildfarm;
@@ -47370,7 +47427,12 @@
 --
 
 CREATE VIEW public.rtest_vview1 AS
-SELECT x.a, x.b FROM public.rtest_view1 x WHERE (0 < (SELECT count(*) AS count FROM public.rtest_view2 y WHERE (y.a = x.a)));
+ SELECT x.a,
+    x.b
+   FROM public.rtest_view1 x
+  WHERE (0 < ( SELECT count(*) AS count
+           FROM public.rtest_view2 y
+          WHERE (y.a = x.a)));
 
 
 ALTER TABLE public.rtest_vview1 OWNER TO buildfarm;
@@ -47380,7 +47442,10 @@
 --
 
 CREATE VIEW public.rtest_vview2 AS
-SELECT rtest_view1.a, rtest_view1.b FROM public.rtest_view1 WHERE rtest_view1.v;
+ SELECT rtest_view1.a,
+    rtest_view1.b
+   FROM public.rtest_view1
+  WHERE rtest_view1.v;
 
 
 ALTER TABLE public.rtest_vview2 OWNER TO buildfarm;
@@ -47390,7 +47455,12 @@
 --
 
 CREATE VIEW public.rtest_vview3 AS
-SELECT x.a, x.b FROM public.rtest_vview2 x WHERE (0 < (SELECT count(*) AS count FROM public.rtest_view2 y WHERE (y.a = x.a)));
+ SELECT x.a,
+    x.b
+   FROM public.rtest_vview2 x
+  WHERE (0 < ( SELECT count(*) AS count
+           FROM public.rtest_view2 y
+          WHERE (y.a = x.a)));
 
 
 ALTER TABLE public.rtest_vview3 OWNER TO buildfarm;
@@ -47400,7 +47470,13 @@
 --
 
 CREATE VIEW public.rtest_vview4 AS
-SELECT x.a, x.b, count(y.a) AS refcount FROM public.rtest_view1 x, public.rtest_view2 y WHERE (x.a = y.a) GROUP BY x.a, x.b;
+ SELECT x.a,
+    x.b,
+    count(y.a) AS refcount
+   FROM public.rtest_view1 x,
+    public.rtest_view2 y
+  WHERE (x.a = y.a)
+  GROUP BY x.a, x.b;
 
 
 ALTER TABLE public.rtest_vview4 OWNER TO buildfarm;
@@ -47410,7 +47486,10 @@
 --
 
 CREATE VIEW public.rtest_vview5 AS
-SELECT rtest_view1.a, rtest_view1.b, public.rtest_viewfunc1(rtest_view1.a) AS refcount FROM public.rtest_view1;
+ SELECT rtest_view1.a,
+    rtest_view1.b,
+    public.rtest_viewfunc1(rtest_view1.a) AS refcount
+   FROM public.rtest_view1;
 
 
 ALTER TABLE public.rtest_vview5 OWNER TO buildfarm;
@@ -47537,7 +47616,17 @@
 --
 
 CREATE VIEW public.shoe AS
-SELECT sh.shoename, sh.sh_avail, sh.slcolor, sh.slminlen, (sh.slminlen * un.un_fact) AS slminlen_cm, sh.slmaxlen, (sh.slmaxlen * un.un_fact) AS slmaxlen_cm, sh.slunit FROM public.shoe_data sh, public.unit un WHERE (sh.slunit = un.un_name);
+ SELECT sh.shoename,
+    sh.sh_avail,
+    sh.slcolor,
+    sh.slminlen,
+    (sh.slminlen * un.un_fact) AS slminlen_cm,
+    sh.slmaxlen,
+    (sh.slmaxlen * un.un_fact) AS slmaxlen_cm,
+    sh.slunit
+   FROM public.shoe_data sh,
+    public.unit un
+  WHERE (sh.slunit = un.un_name);
 
 
 ALTER TABLE public.shoe OWNER TO buildfarm;
@@ -47562,7 +47651,15 @@
 --
 
 CREATE VIEW public.shoelace AS
-SELECT s.sl_name, s.sl_avail, s.sl_color, s.sl_len, s.sl_unit, (s.sl_len * u.un_fact) AS sl_len_cm FROM public.shoelace_data s, public.unit u WHERE (s.sl_unit = u.un_name);
+ SELECT s.sl_name,
+    s.sl_avail,
+    s.sl_color,
+    s.sl_len,
+    s.sl_unit,
+    (s.sl_len * u.un_fact) AS sl_len_cm
+   FROM public.shoelace_data s,
+    public.unit u
+  WHERE (s.sl_unit = u.un_name);
 
 
 ALTER TABLE public.shoelace OWNER TO buildfarm;
@@ -47572,7 +47669,14 @@
 --
 
 CREATE VIEW public.shoe_ready AS
-SELECT rsh.shoename, rsh.sh_avail, rsl.sl_name, rsl.sl_avail, int4smaller(rsh.sh_avail, rsl.sl_avail) AS total_avail FROM public.shoe rsh, public.shoelace rsl WHERE (((rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)) AND (rsl.sl_len_cm <= rsh.slmaxlen_cm));
+ SELECT rsh.shoename,
+    rsh.sh_avail,
+    rsl.sl_name,
+    rsl.sl_avail,
+    int4smaller(rsh.sh_avail, rsl.sl_avail) AS total_avail
+   FROM public.shoe rsh,
+    public.shoelace rsl
+  WHERE ((rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm) AND (rsl.sl_len_cm <= rsh.slmaxlen_cm));
 
 
 ALTER TABLE public.shoe_ready OWNER TO buildfarm;
@@ -47594,7 +47698,16 @@
 --
 
 CREATE VIEW public.shoelace_obsolete AS
-SELECT shoelace.sl_name, shoelace.sl_avail, shoelace.sl_color, shoelace.sl_len, shoelace.sl_unit, shoelace.sl_len_cm FROM public.shoelace WHERE (NOT (EXISTS (SELECT shoe.shoename FROM public.shoe WHERE (shoe.slcolor = shoelace.sl_color))));
+ SELECT shoelace.sl_name,
+    shoelace.sl_avail,
+    shoelace.sl_color,
+    shoelace.sl_len,
+    shoelace.sl_unit,
+    shoelace.sl_len_cm
+   FROM public.shoelace
+  WHERE (NOT (EXISTS ( SELECT shoe.shoename
+           FROM public.shoe
+          WHERE (shoe.slcolor = shoelace.sl_color))));
 
 
 ALTER TABLE public.shoelace_obsolete OWNER TO buildfarm;
@@ -47604,7 +47717,14 @@
 --
 
 CREATE VIEW public.shoelace_candelete AS
-SELECT shoelace_obsolete.sl_name, shoelace_obsolete.sl_avail, shoelace_obsolete.sl_color, shoelace_obsolete.sl_len, shoelace_obsolete.sl_unit, shoelace_obsolete.sl_len_cm FROM public.shoelace_obsolete WHERE (shoelace_obsolete.sl_avail = 0);
+ SELECT shoelace_obsolete.sl_name,
+    shoelace_obsolete.sl_avail,
+    shoelace_obsolete.sl_color,
+    shoelace_obsolete.sl_len,
+    shoelace_obsolete.sl_unit,
+    shoelace_obsolete.sl_len_cm
+   FROM public.shoelace_obsolete
+  WHERE (shoelace_obsolete.sl_avail = 0);
 
 
 ALTER TABLE public.shoelace_candelete OWNER TO buildfarm;
@@ -47651,7 +47771,12 @@
 --
 
 CREATE VIEW public.street AS
-SELECT r.name, r.thepath, c.cname FROM ONLY public.road r, public.real_city c WHERE (c.outline OPERATOR(public.##) r.thepath);
+ SELECT r.name,
+    r.thepath,
+    c.cname
+   FROM ONLY public.road r,
+    public.real_city c
+  WHERE (c.outline OPERATOR(public.##) r.thepath);
 
 
 ALTER TABLE public.street OWNER TO buildfarm;
@@ -47985,7 +48110,11 @@
 --
 
 CREATE VIEW public.toyemp AS
-SELECT emp.name, emp.age, emp.location, (12 * emp.salary) AS annualsal FROM public.emp;
+ SELECT emp.name,
+    emp.age,
+    emp.location,
+    (12 * emp.salary) AS annualsal
+   FROM public.emp;
 
 
 ALTER TABLE public.toyemp OWNER TO buildfarm;
@@ -48138,7 +48267,7 @@
 --
 
 CREATE VIEW public.xmlview1 AS
-SELECT xmlcomment('test'::text) AS xmlcomment;
+ SELECT xmlcomment('test'::text) AS xmlcomment;
 
 
 ALTER TABLE public.xmlview1 OWNER TO buildfarm;
@@ -48148,7 +48277,7 @@
 --
 
 CREATE VIEW public.xmlview2 AS
-SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
+ SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
 
 
 ALTER TABLE public.xmlview2 OWNER TO buildfarm;
@@ -48158,7 +48287,7 @@
 --
 
 CREATE VIEW public.xmlview3 AS
-SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";
+ SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";
 
 
 ALTER TABLE public.xmlview3 OWNER TO buildfarm;
@@ -48168,7 +48297,8 @@
 --
 
 CREATE VIEW public.xmlview4 AS
-SELECT XMLELEMENT(NAME employee, XMLFOREST(emp.name AS name, emp.age AS age, emp.salary AS pay)) AS "xmlelement" FROM public.emp;
+ SELECT XMLELEMENT(NAME employee, XMLFOREST(emp.name AS name, emp.age AS age, emp.salary AS pay)) AS "xmlelement"
+   FROM public.emp;
 
 
 ALTER TABLE public.xmlview4 OWNER TO buildfarm;
@@ -48178,7 +48308,7 @@
 --
 
 CREATE VIEW public.xmlview5 AS
-SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";
+ SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";
 
 
 ALTER TABLE public.xmlview5 OWNER TO buildfarm;
@@ -48188,7 +48318,7 @@
 --
 
 CREATE VIEW public.xmlview6 AS
-SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";
+ SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";
 
 
 ALTER TABLE public.xmlview6 OWNER TO buildfarm;
@@ -48198,7 +48328,7 @@
 --
 
 CREATE VIEW public.xmlview7 AS
-SELECT XMLROOT('<foo/>'::xml, VERSION NO VALUE, STANDALONE YES) AS "xmlroot";
+ SELECT XMLROOT('<foo/>'::xml, VERSION NO VALUE, STANDALONE YES) AS "xmlroot";
 
 
 ALTER TABLE public.xmlview7 OWNER TO buildfarm;
@@ -48208,7 +48338,7 @@
 --
 
 CREATE VIEW public.xmlview8 AS
-SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10)))::character(10) AS "xmlserialize";
+ SELECT (XMLSERIALIZE(CONTENT 'good'::xml AS character(10)))::character(10) AS "xmlserialize";
 
 
 ALTER TABLE public.xmlview8 OWNER TO buildfarm;
@@ -48218,7 +48348,7 @@
 --
 
 CREATE VIEW public.xmlview9 AS
-SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";
+ SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";
 
 
 ALTER TABLE public.xmlview9 OWNER TO buildfarm;
@@ -211371,9 +211501,9 @@
 --
 
 COPY public.test_tsquery (txtkeyword, txtsample, keyword, sample) FROM stdin;
-'New York'	new & york | big & apple | nyc	'new' & 'york'	( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'
+'New York'	new & york | big & apple | nyc	'new' & 'york'	'new' & 'york' | 'big' & 'appl' | 'nyc'
 Moscow	moskva | moscow	'moscow'	'moskva' | 'moscow'
-'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	'peterburg' | 'peter' | 'sanct' & 'peterburg'
 'foo bar qq'	foo & (bar | qq) & city	'foo' & 'bar' & 'qq'	'foo' & ( 'bar' | 'qq' ) & 'citi'
 \.
 
@@ -212954,203 +213084,277 @@
 -- Name: shoelace_data log_shoelace; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE log_shoelace AS ON UPDATE TO public.shoelace_data WHERE (new.sl_avail <> old.sl_avail) DO INSERT INTO public.shoelace_log (sl_name, sl_avail, log_who, log_when) VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name, '1970-01-01 00:00:00'::timestamp without time zone);
+CREATE RULE log_shoelace AS
+    ON UPDATE TO public.shoelace_data
+   WHERE (new.sl_avail <> old.sl_avail) DO  INSERT INTO public.shoelace_log (sl_name, sl_avail, log_who, log_when)
+  VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name, '1970-01-01 00:00:00'::timestamp without time zone);
 
 
 --
 -- Name: ruletest_tbl myrule; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE myrule AS ON INSERT TO public.ruletest_tbl DO INSTEAD INSERT INTO public.ruletest_tbl2 (a, b) VALUES (1000, 1000);
+CREATE RULE myrule AS
+    ON INSERT TO public.ruletest_tbl DO INSTEAD  INSERT INTO public.ruletest_tbl2 (a, b)
+  VALUES (1000, 1000);
 
 
 --
 -- Name: rtest_emp rtest_emp_del; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_emp_del AS ON DELETE TO public.rtest_emp DO INSERT INTO public.rtest_emplog (ename, who, action, newsal, oldsal) VALUES (old.ename, "current_user"(), 'fired'::bpchar, '$0.00'::money, old.salary);
+CREATE RULE rtest_emp_del AS
+    ON DELETE TO public.rtest_emp DO  INSERT INTO public.rtest_emplog (ename, who, action, newsal, oldsal)
+  VALUES (old.ename, "current_user"(), 'fired'::bpchar, '$0.00'::money, old.salary);
 
 
 --
 -- Name: rtest_emp rtest_emp_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_emp_ins AS ON INSERT TO public.rtest_emp DO INSERT INTO public.rtest_emplog (ename, who, action, newsal, oldsal) VALUES (new.ename, "current_user"(), 'hired'::bpchar, new.salary, '$0.00'::money);
+CREATE RULE rtest_emp_ins AS
+    ON INSERT TO public.rtest_emp DO  INSERT INTO public.rtest_emplog (ename, who, action, newsal, oldsal)
+  VALUES (new.ename, "current_user"(), 'hired'::bpchar, new.salary, '$0.00'::money);
 
 
 --
 -- Name: rtest_emp rtest_emp_upd; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_emp_upd AS ON UPDATE TO public.rtest_emp WHERE (new.salary <> old.salary) DO INSERT INTO public.rtest_emplog (ename, who, action, newsal, oldsal) VALUES (new.ename, "current_user"(), 'honored'::bpchar, new.salary, old.salary);
+CREATE RULE rtest_emp_upd AS
+    ON UPDATE TO public.rtest_emp
+   WHERE (new.salary <> old.salary) DO  INSERT INTO public.rtest_emplog (ename, who, action, newsal, oldsal)
+  VALUES (new.ename, "current_user"(), 'honored'::bpchar, new.salary, old.salary);
 
 
 --
 -- Name: rtest_nothn1 rtest_nothn_r1; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_nothn_r1 AS ON INSERT TO public.rtest_nothn1 WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
+CREATE RULE rtest_nothn_r1 AS
+    ON INSERT TO public.rtest_nothn1
+   WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
 
 
 --
 -- Name: rtest_nothn1 rtest_nothn_r2; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_nothn_r2 AS ON INSERT TO public.rtest_nothn1 WHERE ((new.a >= 30) AND (new.a < 40)) DO INSTEAD NOTHING;
+CREATE RULE rtest_nothn_r2 AS
+    ON INSERT TO public.rtest_nothn1
+   WHERE ((new.a >= 30) AND (new.a < 40)) DO INSTEAD NOTHING;
 
 
 --
 -- Name: rtest_nothn2 rtest_nothn_r3; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_nothn_r3 AS ON INSERT TO public.rtest_nothn2 WHERE (new.a >= 100) DO INSTEAD INSERT INTO public.rtest_nothn3 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_nothn_r3 AS
+    ON INSERT TO public.rtest_nothn2
+   WHERE (new.a >= 100) DO INSTEAD  INSERT INTO public.rtest_nothn3 (a, b)
+  VALUES (new.a, new.b);
 
 
 --
 -- Name: rtest_nothn2 rtest_nothn_r4; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_nothn_r4 AS ON INSERT TO public.rtest_nothn2 DO INSTEAD NOTHING;
+CREATE RULE rtest_nothn_r4 AS
+    ON INSERT TO public.rtest_nothn2 DO INSTEAD NOTHING;
 
 
 --
 -- Name: rtest_order1 rtest_order_r1; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_order_r1 AS ON INSERT TO public.rtest_order1 DO INSTEAD INSERT INTO public.rtest_order2 (a, b, c) VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 1 - this should run 1st'::text);
+CREATE RULE rtest_order_r1 AS
+    ON INSERT TO public.rtest_order1 DO INSTEAD  INSERT INTO public.rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 1 - this should run 1st'::text);
 
 
 --
 -- Name: rtest_order1 rtest_order_r2; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_order_r2 AS ON INSERT TO public.rtest_order1 DO INSERT INTO public.rtest_order2 (a, b, c) VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 2 - this should run 2nd'::text);
+CREATE RULE rtest_order_r2 AS
+    ON INSERT TO public.rtest_order1 DO  INSERT INTO public.rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 2 - this should run 2nd'::text);
 
 
 --
 -- Name: rtest_order1 rtest_order_r3; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_order_r3 AS ON INSERT TO public.rtest_order1 DO INSTEAD INSERT INTO public.rtest_order2 (a, b, c) VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 3 - this should run 3rd'::text);
+CREATE RULE rtest_order_r3 AS
+    ON INSERT TO public.rtest_order1 DO INSTEAD  INSERT INTO public.rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 3 - this should run 3rd'::text);
 
 
 --
 -- Name: rtest_order1 rtest_order_r4; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_order_r4 AS ON INSERT TO public.rtest_order1 WHERE (new.a < 100) DO INSTEAD INSERT INTO public.rtest_order2 (a, b, c) VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 4 - this should run 4th'::text);
+CREATE RULE rtest_order_r4 AS
+    ON INSERT TO public.rtest_order1
+   WHERE (new.a < 100) DO INSTEAD  INSERT INTO public.rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('public.rtest_seq'::regclass), 'rule 4 - this should run 4th'::text);
 
 
 --
 -- Name: rtest_person rtest_pers_del; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_pers_del AS ON DELETE TO public.rtest_person DO DELETE FROM public.rtest_admin WHERE (rtest_admin.pname = old.pname);
+CREATE RULE rtest_pers_del AS
+    ON DELETE TO public.rtest_person DO  DELETE FROM public.rtest_admin
+  WHERE (rtest_admin.pname = old.pname);
 
 
 --
 -- Name: rtest_person rtest_pers_upd; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_pers_upd AS ON UPDATE TO public.rtest_person DO UPDATE public.rtest_admin SET pname = new.pname WHERE (rtest_admin.pname = old.pname);
+CREATE RULE rtest_pers_upd AS
+    ON UPDATE TO public.rtest_person DO  UPDATE public.rtest_admin SET pname = new.pname
+  WHERE (rtest_admin.pname = old.pname);
 
 
 --
 -- Name: rtest_system rtest_sys_del; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_sys_del AS ON DELETE TO public.rtest_system DO (DELETE FROM public.rtest_interface WHERE (rtest_interface.sysname = old.sysname); DELETE FROM public.rtest_admin WHERE (rtest_admin.sysname = old.sysname); );
+CREATE RULE rtest_sys_del AS
+    ON DELETE TO public.rtest_system DO ( DELETE FROM public.rtest_interface
+  WHERE (rtest_interface.sysname = old.sysname);
+ DELETE FROM public.rtest_admin
+  WHERE (rtest_admin.sysname = old.sysname);
+);
 
 
 --
 -- Name: rtest_system rtest_sys_upd; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_sys_upd AS ON UPDATE TO public.rtest_system DO (UPDATE public.rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname); UPDATE public.rtest_admin SET sysname = new.sysname WHERE (rtest_admin.sysname = old.sysname); );
+CREATE RULE rtest_sys_upd AS
+    ON UPDATE TO public.rtest_system DO ( UPDATE public.rtest_interface SET sysname = new.sysname
+  WHERE (rtest_interface.sysname = old.sysname);
+ UPDATE public.rtest_admin SET sysname = new.sysname
+  WHERE (rtest_admin.sysname = old.sysname);
+);
 
 
 --
 -- Name: rtest_t4 rtest_t4_ins1; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_t4_ins1 AS ON INSERT TO public.rtest_t4 WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD INSERT INTO public.rtest_t5 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t4_ins1 AS
+    ON INSERT TO public.rtest_t4
+   WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD  INSERT INTO public.rtest_t5 (a, b)
+  VALUES (new.a, new.b);
 
 
 --
 -- Name: rtest_t4 rtest_t4_ins2; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_t4_ins2 AS ON INSERT TO public.rtest_t4 WHERE ((new.a >= 20) AND (new.a < 30)) DO INSERT INTO public.rtest_t6 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t4_ins2 AS
+    ON INSERT TO public.rtest_t4
+   WHERE ((new.a >= 20) AND (new.a < 30)) DO  INSERT INTO public.rtest_t6 (a, b)
+  VALUES (new.a, new.b);
 
 
 --
 -- Name: rtest_t5 rtest_t5_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_t5_ins AS ON INSERT TO public.rtest_t5 WHERE (new.a > 15) DO INSERT INTO public.rtest_t7 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t5_ins AS
+    ON INSERT TO public.rtest_t5
+   WHERE (new.a > 15) DO  INSERT INTO public.rtest_t7 (a, b)
+  VALUES (new.a, new.b);
 
 
 --
 -- Name: rtest_t6 rtest_t6_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_t6_ins AS ON INSERT TO public.rtest_t6 WHERE (new.a > 25) DO INSTEAD INSERT INTO public.rtest_t8 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t6_ins AS
+    ON INSERT TO public.rtest_t6
+   WHERE (new.a > 25) DO INSTEAD  INSERT INTO public.rtest_t8 (a, b)
+  VALUES (new.a, new.b);
 
 
 --
 -- Name: rtest_v1 rtest_v1_del; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_v1_del AS ON DELETE TO public.rtest_v1 DO INSTEAD DELETE FROM public.rtest_t1 WHERE (rtest_t1.a = old.a);
+CREATE RULE rtest_v1_del AS
+    ON DELETE TO public.rtest_v1 DO INSTEAD  DELETE FROM public.rtest_t1
+  WHERE (rtest_t1.a = old.a);
 
 
 --
 -- Name: rtest_v1 rtest_v1_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_v1_ins AS ON INSERT TO public.rtest_v1 DO INSTEAD INSERT INTO public.rtest_t1 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_v1_ins AS
+    ON INSERT TO public.rtest_v1 DO INSTEAD  INSERT INTO public.rtest_t1 (a, b)
+  VALUES (new.a, new.b);
 
 
 --
 -- Name: rtest_v1 rtest_v1_upd; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rtest_v1_upd AS ON UPDATE TO public.rtest_v1 DO INSTEAD UPDATE public.rtest_t1 SET a = new.a, b = new.b WHERE (rtest_t1.a = old.a);
+CREATE RULE rtest_v1_upd AS
+    ON UPDATE TO public.rtest_v1 DO INSTEAD  UPDATE public.rtest_t1 SET a = new.a, b = new.b
+  WHERE (rtest_t1.a = old.a);
 
 
 --
 -- Name: rule_and_refint_t3 rule_and_refint_t3_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE rule_and_refint_t3_ins AS ON INSERT TO public.rule_and_refint_t3 WHERE (EXISTS (SELECT 1 FROM public.rule_and_refint_t3 WHERE (((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)) AND (rule_and_refint_t3.id3c = new.id3c)))) DO INSTEAD UPDATE public.rule_and_refint_t3 SET data = new.data WHERE (((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)) AND (rule_and_refint_t3.id3c = new.id3c));
+CREATE RULE rule_and_refint_t3_ins AS
+    ON INSERT TO public.rule_and_refint_t3
+   WHERE (EXISTS ( SELECT 1
+           FROM public.rule_and_refint_t3 rule_and_refint_t3_1
+          WHERE ((rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b) AND (rule_and_refint_t3_1.id3c = new.id3c)))) DO INSTEAD  UPDATE public.rule_and_refint_t3 SET data = new.data
+  WHERE ((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b) AND (rule_and_refint_t3.id3c = new.id3c));
 
 
 --
 -- Name: shoelace shoelace_del; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE shoelace_del AS ON DELETE TO public.shoelace DO INSTEAD DELETE FROM public.shoelace_data WHERE (shoelace_data.sl_name = old.sl_name);
+CREATE RULE shoelace_del AS
+    ON DELETE TO public.shoelace DO INSTEAD  DELETE FROM public.shoelace_data
+  WHERE (shoelace_data.sl_name = old.sl_name);
 
 
 --
 -- Name: shoelace shoelace_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE shoelace_ins AS ON INSERT TO public.shoelace DO INSTEAD INSERT INTO public.shoelace_data (sl_name, sl_avail, sl_color, sl_len, sl_unit) VALUES (new.sl_name, new.sl_avail, new.sl_color, new.sl_len, new.sl_unit);
+CREATE RULE shoelace_ins AS
+    ON INSERT TO public.shoelace DO INSTEAD  INSERT INTO public.shoelace_data (sl_name, sl_avail, sl_color, sl_len, sl_unit)
+  VALUES (new.sl_name, new.sl_avail, new.sl_color, new.sl_len, new.sl_unit);
 
 
 --
 -- Name: shoelace_ok shoelace_ok_ins; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE shoelace_ok_ins AS ON INSERT TO public.shoelace_ok DO INSTEAD UPDATE public.shoelace SET sl_avail = (shoelace.sl_avail + new.ok_quant) WHERE (shoelace.sl_name = new.ok_name);
+CREATE RULE shoelace_ok_ins AS
+    ON INSERT TO public.shoelace_ok DO INSTEAD  UPDATE public.shoelace SET sl_avail = (shoelace.sl_avail + new.ok_quant)
+  WHERE (shoelace.sl_name = new.ok_name);
 
 
 --
 -- Name: shoelace shoelace_upd; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE shoelace_upd AS ON UPDATE TO public.shoelace DO INSTEAD UPDATE public.shoelace_data SET sl_name = new.sl_name, sl_avail = new.sl_avail, sl_color = new.sl_color, sl_len = new.sl_len, sl_unit = new.sl_unit WHERE (shoelace_data.sl_name = old.sl_name);
+CREATE RULE shoelace_upd AS
+    ON UPDATE TO public.shoelace DO INSTEAD  UPDATE public.shoelace_data SET sl_name = new.sl_name, sl_avail = new.sl_avail, sl_color = new.sl_color, sl_len = new.sl_len, sl_unit = new.sl_unit
+  WHERE (shoelace_data.sl_name = old.sl_name);
 
 
 --
@@ -213516,22 +213720,10 @@
 
 
 --
--- Name: DATABASE regression; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON DATABASE regression FROM PUBLIC;
-REVOKE ALL ON DATABASE regression FROM buildfarm;
-GRANT ALL ON DATABASE regression TO buildfarm;
-GRANT CONNECT,TEMPORARY ON DATABASE regression TO PUBLIC;
-
-
---
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -213539,9 +213731,6 @@
 -- Name: TABLE my_credit_card_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_normal TO PUBLIC;
 
 
@@ -213549,9 +213738,6 @@
 -- Name: TABLE my_credit_card_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_secure TO PUBLIC;
 
 
@@ -213559,9 +213745,6 @@
 -- Name: TABLE my_credit_card_usage_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_normal TO PUBLIC;
 
 
@@ -213569,9 +213752,6 @@
 -- Name: TABLE my_credit_card_usage_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_secure TO PUBLIC;
 
 
@@ -213579,9 +213759,6 @@
 -- Name: TABLE my_property_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_normal TO PUBLIC;
 
 
@@ -213589,9 +213766,6 @@
 -- Name: TABLE my_property_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_secure TO PUBLIC;
 
 

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL9_3_STABLE.sql.fixed	2021-09-12 16:02:14.283096016 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL9_3_STABLE-to-HEAD.sql.fixed	2021-09-12 16:02:14.302096017 -0400
@@ -62,9 +62,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -1501,9 +1501,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -8634,9 +8634,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -9477,9 +9477,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -27944,9 +27944,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -28198,9 +28198,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31431,9 +31431,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31536,9 +31534,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31641,9 +31637,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31753,9 +31749,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31844,9 +31838,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -31935,9 +31927,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -33147,9 +33139,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -33238,9 +33228,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -35403,9 +35393,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36566,9 +36556,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36727,9 +36717,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -36869,9 +36859,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -37047,9 +37037,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -37961,9 +37949,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -40672,9 +40660,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -40992,9 +40980,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41110,9 +41096,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41215,9 +41199,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -41306,9 +41288,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -42250,9 +42232,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -42297,9 +42277,7 @@
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -42420,7 +42398,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -42443,7 +42422,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -42530,6 +42510,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -42577,6 +42558,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -43021,6 +43003,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -47481,7 +47466,7 @@
     x integer,
     y text,
     z integer,
-    CONSTRAINT sequence_con CHECK ((((x > 3) AND (y <> 'check failed'::text)) AND (z < 8)))
+    CONSTRAINT sequence_con CHECK (((x > 3) AND (y <> 'check failed'::text) AND (z < 8)))
 );
 
 
@@ -47624,7 +47609,7 @@
     x integer,
     y text,
     z integer,
-    CONSTRAINT copy_con CHECK ((((x > 3) AND (y <> 'check failed'::text)) AND (x < 7)))
+    CONSTRAINT copy_con CHECK (((x > 3) AND (y <> 'check failed'::text) AND (x < 7)))
 );
 
 
@@ -48220,8 +48205,8 @@
 CREATE TABLE public.insert_tbl (
     x integer DEFAULT nextval('public.insert_seq'::regclass),
     y text DEFAULT '-NULL-'::text,
-    z integer DEFAULT ((-1) * currval('public.insert_seq'::regclass)),
-    CONSTRAINT insert_con CHECK ((((x >= 3) AND (y <> 'check failed'::text)) AND (x < 8))),
+    z integer DEFAULT ('-1'::integer * currval('public.insert_seq'::regclass)),
+    CONSTRAINT insert_con CHECK (((x >= 3) AND (y <> 'check failed'::text) AND (x < 8))),
     CONSTRAINT insert_tbl_check CHECK (((x + z) = 0))
 );
 
@@ -49598,7 +49583,7 @@
     int4smaller(rsh.sh_avail, rsl.sl_avail) AS total_avail
    FROM public.shoe rsh,
     public.shoelace rsl
-  WHERE (((rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm)) AND (rsl.sl_len_cm <= rsh.slmaxlen_cm));
+  WHERE ((rsl.sl_color = rsh.slcolor) AND (rsl.sl_len_cm >= rsh.slminlen_cm) AND (rsl.sl_len_cm <= rsh.slmaxlen_cm));
 
 
 ALTER TABLE public.shoe_ready OWNER TO buildfarm;
@@ -219801,9 +219786,9 @@
 --
 
 COPY public.test_tsquery (txtkeyword, txtsample, keyword, sample) FROM stdin;
-'New York'	new & york | big & apple | nyc	'new' & 'york'	( 'new' & 'york' | 'big' & 'appl' ) | 'nyc'
+'New York'	new & york | big & apple | nyc	'new' & 'york'	'new' & 'york' | 'big' & 'appl' | 'nyc'
 Moscow	moskva | moscow	'moscow'	'moskva' | 'moscow'
-'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	( 'peterburg' | 'peter' ) | 'sanct' & 'peterburg'
+'Sanct Peter'	Peterburg | peter | 'Sanct Peterburg'	'sanct' & 'peter'	'peterburg' | 'peter' | 'sanct' & 'peterburg'
 'foo bar qq'	foo & (bar | qq) & city	'foo' & 'bar' & 'qq'	'foo' & ( 'bar' | 'qq' ) & 'citi'
 \.
 
@@ -221688,8 +221673,8 @@
     ON INSERT TO public.rule_and_refint_t3
    WHERE (EXISTS ( SELECT 1
            FROM public.rule_and_refint_t3 rule_and_refint_t3_1
-          WHERE (((rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b)) AND (rule_and_refint_t3_1.id3c = new.id3c)))) DO INSTEAD  UPDATE public.rule_and_refint_t3 SET data = new.data
-  WHERE (((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b)) AND (rule_and_refint_t3.id3c = new.id3c));
+          WHERE ((rule_and_refint_t3_1.id3a = new.id3a) AND (rule_and_refint_t3_1.id3b = new.id3b) AND (rule_and_refint_t3_1.id3c = new.id3c)))) DO INSTEAD  UPDATE public.rule_and_refint_t3 SET data = new.data
+  WHERE ((rule_and_refint_t3.id3a = new.id3a) AND (rule_and_refint_t3.id3b = new.id3b) AND (rule_and_refint_t3.id3c = new.id3c));
 
 
 --
@@ -222091,22 +222076,10 @@
 
 
 --
--- Name: DATABASE regression; Type: ACL; Schema: -; Owner: buildfarm
---
-
-REVOKE ALL ON DATABASE regression FROM PUBLIC;
-REVOKE ALL ON DATABASE regression FROM buildfarm;
-GRANT ALL ON DATABASE regression TO buildfarm;
-GRANT CONNECT,TEMPORARY ON DATABASE regression TO PUBLIC;
-
-
---
 -- Name: SCHEMA public; Type: ACL; Schema: -; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
+REVOKE USAGE ON SCHEMA public FROM PUBLIC;
 GRANT ALL ON SCHEMA public TO PUBLIC;
 
 
@@ -222114,9 +222087,6 @@
 -- Name: TABLE my_credit_card_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_normal TO PUBLIC;
 
 
@@ -222124,9 +222094,6 @@
 -- Name: TABLE my_credit_card_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_secure TO PUBLIC;
 
 
@@ -222134,9 +222101,6 @@
 -- Name: TABLE my_credit_card_usage_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_normal TO PUBLIC;
 
 
@@ -222144,9 +222108,6 @@
 -- Name: TABLE my_credit_card_usage_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_credit_card_usage_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_credit_card_usage_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_credit_card_usage_secure TO PUBLIC;
 
 
@@ -222154,9 +222115,6 @@
 -- Name: TABLE my_property_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_normal FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_normal FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_normal TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_normal TO PUBLIC;
 
 
@@ -222164,9 +222122,6 @@
 -- Name: TABLE my_property_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE public.my_property_secure FROM PUBLIC;
-REVOKE ALL ON TABLE public.my_property_secure FROM buildfarm;
-GRANT ALL ON TABLE public.my_property_secure TO buildfarm;
 GRANT SELECT ON TABLE public.my_property_secure TO PUBLIC;
 
 

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL9_6_STABLE.sql.fixed	2021-09-12 16:06:12.532099754 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL9_6_STABLE-to-HEAD.sql.fixed	2021-09-12 16:06:12.559099754 -0400
@@ -53507,7 +53557,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -53530,7 +53581,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -53617,6 +53669,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -53664,6 +53717,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -54190,6 +54244,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL_10_STABLE.sql.fixed	2021-09-12 16:07:51.164101299 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL_10_STABLE-to-HEAD.sql.fixed	2021-09-12 16:07:51.194101299 -0400
@@ -166523,7 +166575,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -166546,7 +166599,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -166633,6 +166687,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -166680,6 +166735,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -167218,6 +167274,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL_11_STABLE.sql.fixed	2021-09-12 16:09:57.235103275 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL_11_STABLE-to-HEAD.sql.fixed	2021-09-12 16:09:57.285103276 -0400
@@ -169304,7 +169352,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE plperl
     AS $_$
 my ($a, $b, $c) = @_;
@@ -169312,7 +169360,7 @@
 $_$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: text_arrayref(); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -170252,7 +170304,7 @@
 -- Name: p1(integer, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.p1(v_cnt integer, INOUT v_text text DEFAULT NULL::text)
+CREATE PROCEDURE public.p1(IN v_cnt integer, INOUT v_text text DEFAULT NULL::text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -170261,7 +170313,7 @@
 $$;
 
 
-ALTER PROCEDURE public.p1(v_cnt integer, INOUT v_text text) OWNER TO buildfarm;
+ALTER PROCEDURE public.p1(IN v_cnt integer, INOUT v_text text) OWNER TO buildfarm;
 
 --
 -- Name: read_ordered_int8s(public.ordered_int8s); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -170708,7 +170760,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -170718,13 +170770,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7(integer, integer, numeric); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7(x integer, INOUT a integer, INOUT b numeric)
+CREATE PROCEDURE public.test_proc7(IN x integer, INOUT a integer, INOUT b numeric)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -170737,13 +170789,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7(x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7(IN x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7c(integer, integer, numeric); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7c(x integer, INOUT a integer, INOUT b numeric)
+CREATE PROCEDURE public.test_proc7c(IN x integer, INOUT a integer, INOUT b numeric)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -170754,13 +170806,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7c(x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7c(IN x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7cc(integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7cc(_x integer)
+CREATE PROCEDURE public.test_proc7cc(IN _x integer)
     LANGUAGE plpgsql
     AS $$
 DECLARE _a int; _b numeric;
@@ -170771,7 +170823,7 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7cc(_x integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7cc(IN _x integer) OWNER TO buildfarm;
 
 --
 -- Name: test_proc8a(integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -170880,7 +170932,7 @@
 -- Name: transaction_test1(integer, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.transaction_test1(x integer, y text)
+CREATE PROCEDURE public.transaction_test1(IN x integer, IN y text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -170896,7 +170948,7 @@
 $$;
 
 
-ALTER PROCEDURE public.transaction_test1(x integer, y text) OWNER TO buildfarm;
+ALTER PROCEDURE public.transaction_test1(IN x integer, IN y text) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test10a(integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -171056,7 +171108,7 @@
 -- Name: transaction_test6(text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.transaction_test6(c text)
+CREATE PROCEDURE public.transaction_test6(IN c text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171065,7 +171117,7 @@
 $$;
 
 
-ALTER PROCEDURE public.transaction_test6(c text) OWNER TO buildfarm;
+ALTER PROCEDURE public.transaction_test6(IN c text) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test7(); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -173142,7 +173198,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE pltcl
     AS $_$
 set bb [expr $2 * $1]
@@ -173151,7 +173207,7 @@
 $_$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test1(); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -174092,7 +174148,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -174115,7 +174172,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -174202,6 +174260,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -174249,6 +174308,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -174787,6 +174847,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -176580,7 +176643,7 @@
 -- Name: ptest3(text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest3(y text)
+CREATE PROCEDURE public.ptest3(IN y text)
     LANGUAGE sql
     AS $_$
 CALL ptest1(y);
@@ -176588,13 +176651,13 @@
 $_$;
 
 
-ALTER PROCEDURE public.ptest3(y text) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest3(IN y text) OWNER TO buildfarm;
 
 --
 -- Name: ptest5(integer, text, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest5(a integer, b text, c integer DEFAULT 100)
+CREATE PROCEDURE public.ptest5(IN a integer, IN b text, IN c integer DEFAULT 100)
     LANGUAGE sql
     AS $$
 INSERT INTO cp_test VALUES(a, b);
@@ -176602,33 +176665,33 @@
 $$;
 
 
-ALTER PROCEDURE public.ptest5(a integer, b text, c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest5(IN a integer, IN b text, IN c integer) OWNER TO buildfarm;
 
 --
 -- Name: ptest6(integer, anyelement); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest6(a integer, b anyelement)
+CREATE PROCEDURE public.ptest6(IN a integer, IN b anyelement)
     LANGUAGE sql
     AS $$
 SELECT NULL::int;
 $$;
 
 
-ALTER PROCEDURE public.ptest6(a integer, b anyelement) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest6(IN a integer, IN b anyelement) OWNER TO buildfarm;
 
 --
 -- Name: ptest7(text, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest7(a text, b text)
+CREATE PROCEDURE public.ptest7(IN a text, IN b text)
     LANGUAGE sql
     AS $$
 SELECT a = b;
 $$;
 
 
-ALTER PROCEDURE public.ptest7(a text, b text) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest7(IN a text, IN b text) OWNER TO buildfarm;
 
 --
 -- Name: raise_test3(integer); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -179728,6 +179791,8 @@
 --
 
 CREATE OPERATOR FAMILY public.part_test_int4_ops USING hash;
+ALTER OPERATOR FAMILY public.part_test_int4_ops USING hash ADD
+    FUNCTION 2 (integer, integer) public.part_hashint4_noop(integer,bigint);
 
 
 ALTER OPERATOR FAMILY public.part_test_int4_ops USING hash OWNER TO buildfarm;
@@ -179738,8 +179803,7 @@
 
 CREATE OPERATOR CLASS public.part_test_int4_ops
     FOR TYPE integer USING hash FAMILY public.part_test_int4_ops AS
-    OPERATOR 1 =(integer,integer) ,
-    FUNCTION 2 (integer, integer) public.part_hashint4_noop(integer,bigint);
+    OPERATOR 1 =(integer,integer);
 
 
 ALTER OPERATOR CLASS public.part_test_int4_ops USING hash OWNER TO buildfarm;
@@ -179758,6 +179822,8 @@
 --
 
 CREATE OPERATOR FAMILY public.part_test_text_ops USING hash;
+ALTER OPERATOR FAMILY public.part_test_text_ops USING hash ADD
+    FUNCTION 2 (text, text) public.part_hashtext_length(text,bigint);
 
 
 ALTER OPERATOR FAMILY public.part_test_text_ops USING hash OWNER TO buildfarm;
@@ -179768,8 +179834,7 @@
 
 CREATE OPERATOR CLASS public.part_test_text_ops
     FOR TYPE text USING hash FAMILY public.part_test_text_ops AS
-    OPERATOR 1 =(text,text) ,
-    FUNCTION 2 (text, text) public.part_hashtext_length(text,bigint);
+    OPERATOR 1 =(text,text);
 
 
 ALTER OPERATOR CLASS public.part_test_text_ops USING hash OWNER TO buildfarm;

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL_12_STABLE.sql.fixed	2021-09-12 16:12:00.510107180 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL_12_STABLE-to-HEAD.sql.fixed	2021-09-12 16:12:00.559107182 -0400
@@ -169778,7 +169778,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE plperl
     AS $_$
 my ($a, $b, $c) = @_;
@@ -169786,7 +169786,7 @@
 $_$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: text_arrayref(); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -170757,7 +170757,7 @@
 -- Name: p1(integer, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.p1(v_cnt integer, INOUT v_text text DEFAULT NULL::text)
+CREATE PROCEDURE public.p1(IN v_cnt integer, INOUT v_text text DEFAULT NULL::text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -170766,7 +170766,7 @@
 $$;
 
 
-ALTER PROCEDURE public.p1(v_cnt integer, INOUT v_text text) OWNER TO buildfarm;
+ALTER PROCEDURE public.p1(IN v_cnt integer, INOUT v_text text) OWNER TO buildfarm;
 
 --
 -- Name: read_ordered_int8s(public.ordered_int8s); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -171239,7 +171239,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171249,13 +171249,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7(integer, integer, numeric); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7(x integer, INOUT a integer, INOUT b numeric)
+CREATE PROCEDURE public.test_proc7(IN x integer, INOUT a integer, INOUT b numeric)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171268,13 +171268,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7(x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7(IN x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7c(integer, integer, numeric); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7c(x integer, INOUT a integer, INOUT b numeric)
+CREATE PROCEDURE public.test_proc7c(IN x integer, INOUT a integer, INOUT b numeric)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171285,13 +171285,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7c(x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7c(IN x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7cc(integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7cc(_x integer)
+CREATE PROCEDURE public.test_proc7cc(IN _x integer)
     LANGUAGE plpgsql
     AS $$
 DECLARE _a int; _b numeric;
@@ -171302,7 +171302,7 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7cc(_x integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7cc(IN _x integer) OWNER TO buildfarm;
 
 --
 -- Name: test_proc8a(integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -171435,7 +171435,7 @@
 -- Name: transaction_test1(integer, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.transaction_test1(x integer, y text)
+CREATE PROCEDURE public.transaction_test1(IN x integer, IN y text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171451,7 +171451,7 @@
 $$;
 
 
-ALTER PROCEDURE public.transaction_test1(x integer, y text) OWNER TO buildfarm;
+ALTER PROCEDURE public.transaction_test1(IN x integer, IN y text) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test10a(integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -171611,7 +171611,7 @@
 -- Name: transaction_test6(text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.transaction_test6(c text)
+CREATE PROCEDURE public.transaction_test6(IN c text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171620,7 +171620,7 @@
 $$;
 
 
-ALTER PROCEDURE public.transaction_test6(c text) OWNER TO buildfarm;
+ALTER PROCEDURE public.transaction_test6(IN c text) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test7(); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -173932,7 +173932,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE pltcl
     AS $_$
 set bb [expr $2 * $1]
@@ -173941,7 +173941,7 @@
 $_$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test1(); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -174975,7 +174975,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -174998,7 +174999,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -175085,6 +175087,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -175132,6 +175135,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -175680,6 +175684,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -177545,7 +177550,7 @@
 -- Name: ptest3(text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest3(y text)
+CREATE PROCEDURE public.ptest3(IN y text)
     LANGUAGE sql
     AS $_$
 CALL ptest1(y);
@@ -177553,13 +177558,13 @@
 $_$;
 
 
-ALTER PROCEDURE public.ptest3(y text) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest3(IN y text) OWNER TO buildfarm;
 
 --
 -- Name: ptest5(integer, text, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest5(a integer, b text, c integer DEFAULT 100)
+CREATE PROCEDURE public.ptest5(IN a integer, IN b text, IN c integer DEFAULT 100)
     LANGUAGE sql
     AS $$
 INSERT INTO cp_test VALUES(a, b);
@@ -177567,33 +177572,33 @@
 $$;
 
 
-ALTER PROCEDURE public.ptest5(a integer, b text, c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest5(IN a integer, IN b text, IN c integer) OWNER TO buildfarm;
 
 --
 -- Name: ptest6(integer, anyelement); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest6(a integer, b anyelement)
+CREATE PROCEDURE public.ptest6(IN a integer, IN b anyelement)
     LANGUAGE sql
     AS $$
 SELECT NULL::int;
 $$;
 
 
-ALTER PROCEDURE public.ptest6(a integer, b anyelement) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest6(IN a integer, IN b anyelement) OWNER TO buildfarm;
 
 --
 -- Name: ptest7(text, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest7(a text, b text)
+CREATE PROCEDURE public.ptest7(IN a text, IN b text)
     LANGUAGE sql
     AS $$
 SELECT a = b;
 $$;
 
 
-ALTER PROCEDURE public.ptest7(a text, b text) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest7(IN a text, IN b text) OWNER TO buildfarm;
 
 --
 -- Name: raise_test3(integer); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -180561,6 +180566,8 @@
 --
 
 CREATE OPERATOR FAMILY public.part_test_int4_ops USING hash;
+ALTER OPERATOR FAMILY public.part_test_int4_ops USING hash ADD
+    FUNCTION 2 (integer, integer) public.part_hashint4_noop(integer,bigint);
 
 
 ALTER OPERATOR FAMILY public.part_test_int4_ops USING hash OWNER TO buildfarm;
@@ -180571,8 +180578,7 @@
 
 CREATE OPERATOR CLASS public.part_test_int4_ops
     FOR TYPE integer USING hash FAMILY public.part_test_int4_ops AS
-    OPERATOR 1 =(integer,integer) ,
-    FUNCTION 2 (integer, integer) public.part_hashint4_noop(integer,bigint);
+    OPERATOR 1 =(integer,integer);
 
 
 ALTER OPERATOR CLASS public.part_test_int4_ops USING hash OWNER TO buildfarm;
@@ -180591,6 +180597,8 @@
 --
 
 CREATE OPERATOR FAMILY public.part_test_text_ops USING hash;
+ALTER OPERATOR FAMILY public.part_test_text_ops USING hash ADD
+    FUNCTION 2 (text, text) public.part_hashtext_length(text,bigint);
 
 
 ALTER OPERATOR FAMILY public.part_test_text_ops USING hash OWNER TO buildfarm;
@@ -180601,8 +180609,7 @@
 
 CREATE OPERATOR CLASS public.part_test_text_ops
     FOR TYPE text USING hash FAMILY public.part_test_text_ops AS
-    OPERATOR 1 =(text,text) ,
-    FUNCTION 2 (text, text) public.part_hashtext_length(text,bigint);
+    OPERATOR 1 =(text,text);
 
 
 ALTER OPERATOR CLASS public.part_test_text_ops USING hash OWNER TO buildfarm;

--- /home/andrew/bf/root/upgrade.crake/HEAD/origin-REL_13_STABLE.sql.fixed	2021-09-12 16:14:12.048111840 -0400
+++ /home/andrew/bf/root/upgrade.crake/HEAD/converted-REL_13_STABLE-to-HEAD.sql.fixed	2021-09-12 16:14:12.100111841 -0400
@@ -170167,7 +170167,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE plperl
     AS $_$
 my ($a, $b, $c) = @_;
@@ -170175,7 +170175,7 @@
 $_$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: text_arrayref(); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -171155,7 +171155,7 @@
 -- Name: p1(integer, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.p1(v_cnt integer, INOUT v_text text DEFAULT NULL::text)
+CREATE PROCEDURE public.p1(IN v_cnt integer, INOUT v_text text DEFAULT NULL::text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171164,7 +171164,7 @@
 $$;
 
 
-ALTER PROCEDURE public.p1(v_cnt integer, INOUT v_text text) OWNER TO buildfarm;
+ALTER PROCEDURE public.p1(IN v_cnt integer, INOUT v_text text) OWNER TO buildfarm;
 
 --
 -- Name: read_ordered_int8s(public.ordered_int8s); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -171686,7 +171686,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171696,13 +171696,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7(integer, integer, numeric); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7(x integer, INOUT a integer, INOUT b numeric)
+CREATE PROCEDURE public.test_proc7(IN x integer, INOUT a integer, INOUT b numeric)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171715,13 +171715,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7(x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7(IN x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7c(integer, integer, numeric); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7c(x integer, INOUT a integer, INOUT b numeric)
+CREATE PROCEDURE public.test_proc7c(IN x integer, INOUT a integer, INOUT b numeric)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171732,13 +171732,13 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7c(x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7c(IN x integer, INOUT a integer, INOUT b numeric) OWNER TO buildfarm;
 
 --
 -- Name: test_proc7cc(integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc7cc(_x integer)
+CREATE PROCEDURE public.test_proc7cc(IN _x integer)
     LANGUAGE plpgsql
     AS $$
 DECLARE _a int; _b numeric;
@@ -171749,7 +171749,7 @@
 $$;
 
 
-ALTER PROCEDURE public.test_proc7cc(_x integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc7cc(IN _x integer) OWNER TO buildfarm;
 
 --
 -- Name: test_proc8a(integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -171882,7 +171882,7 @@
 -- Name: transaction_test1(integer, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.transaction_test1(x integer, y text)
+CREATE PROCEDURE public.transaction_test1(IN x integer, IN y text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -171898,7 +171898,7 @@
 $$;
 
 
-ALTER PROCEDURE public.transaction_test1(x integer, y text) OWNER TO buildfarm;
+ALTER PROCEDURE public.transaction_test1(IN x integer, IN y text) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test10a(integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -172058,7 +172058,7 @@
 -- Name: transaction_test6(text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.transaction_test6(c text)
+CREATE PROCEDURE public.transaction_test6(IN c text)
     LANGUAGE plpgsql
     AS $$
 BEGIN
@@ -172067,7 +172067,7 @@
 $$;
 
 
-ALTER PROCEDURE public.transaction_test6(c text) OWNER TO buildfarm;
+ALTER PROCEDURE public.transaction_test6(IN c text) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test7(); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -174390,7 +174390,7 @@
 -- Name: test_proc6(integer, integer, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer)
+CREATE PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer)
     LANGUAGE pltcl
     AS $_$
 set bb [expr $2 * $1]
@@ -174399,7 +174399,7 @@
 $_$;
 
 
-ALTER PROCEDURE public.test_proc6(a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.test_proc6(IN a integer, INOUT b integer, INOUT c integer) OWNER TO buildfarm;
 
 --
 -- Name: transaction_test1(); Type: PROCEDURE; Schema: public; Owner: buildfarm
@@ -175433,7 +175433,8 @@
 --
 
 CREATE TYPE public.arrayrange AS RANGE (
-    subtype = integer[]
+    subtype = integer[],
+    multirange_type_name = public.arraymultirange
 );
 
 
@@ -175456,7 +175457,8 @@
 --
 
 CREATE TYPE public.cashrange AS RANGE (
-    subtype = money
+    subtype = money,
+    multirange_type_name = public.cashmultirange
 );
 
 
@@ -175543,6 +175545,7 @@
     INTERNALLENGTH = 16,
     INPUT = public.int44in,
     OUTPUT = public.int44out,
+    SUBSCRIPT = raw_array_subscript_handler,
     ELEMENT = integer,
     CATEGORY = 'x',
     PREFERRED = true,
@@ -175590,6 +175593,7 @@
 
 CREATE TYPE public.float8range AS RANGE (
     subtype = double precision,
+    multirange_type_name = public.float8multirange,
     subtype_diff = float8mi
 );
 
@@ -176138,6 +176142,7 @@
 
 CREATE TYPE public.textrange AS RANGE (
     subtype = text,
+    multirange_type_name = public.textmultirange,
     collation = pg_catalog."C"
 );
 
@@ -178259,7 +178264,7 @@
 -- Name: ptest3(text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest3(y text)
+CREATE PROCEDURE public.ptest3(IN y text)
     LANGUAGE sql
     AS $_$
 CALL ptest1(y);
@@ -178267,13 +178272,13 @@
 $_$;
 
 
-ALTER PROCEDURE public.ptest3(y text) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest3(IN y text) OWNER TO buildfarm;
 
 --
 -- Name: ptest5(integer, text, integer); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest5(a integer, b text, c integer DEFAULT 100)
+CREATE PROCEDURE public.ptest5(IN a integer, IN b text, IN c integer DEFAULT 100)
     LANGUAGE sql
     AS $$
 INSERT INTO cp_test VALUES(a, b);
@@ -178281,33 +178286,33 @@
 $$;
 
 
-ALTER PROCEDURE public.ptest5(a integer, b text, c integer) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest5(IN a integer, IN b text, IN c integer) OWNER TO buildfarm;
 
 --
 -- Name: ptest6(integer, anyelement); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest6(a integer, b anyelement)
+CREATE PROCEDURE public.ptest6(IN a integer, IN b anyelement)
     LANGUAGE sql
     AS $$
 SELECT NULL::int;
 $$;
 
 
-ALTER PROCEDURE public.ptest6(a integer, b anyelement) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest6(IN a integer, IN b anyelement) OWNER TO buildfarm;
 
 --
 -- Name: ptest7(text, text); Type: PROCEDURE; Schema: public; Owner: buildfarm
 --
 
-CREATE PROCEDURE public.ptest7(a text, b text)
+CREATE PROCEDURE public.ptest7(IN a text, IN b text)
     LANGUAGE sql
     AS $$
 SELECT a = b;
 $$;
 
 
-ALTER PROCEDURE public.ptest7(a text, b text) OWNER TO buildfarm;
+ALTER PROCEDURE public.ptest7(IN a text, IN b text) OWNER TO buildfarm;
 
 --
 -- Name: raise_test3(integer); Type: FUNCTION; Schema: public; Owner: buildfarm
@@ -181298,6 +181303,8 @@
 --
 
 CREATE OPERATOR FAMILY public.part_test_int4_ops USING hash;
+ALTER OPERATOR FAMILY public.part_test_int4_ops USING hash ADD
+    FUNCTION 2 (integer, integer) public.part_hashint4_noop(integer,bigint);
 
 
 ALTER OPERATOR FAMILY public.part_test_int4_ops USING hash OWNER TO buildfarm;
@@ -181308,8 +181315,7 @@
 
 CREATE OPERATOR CLASS public.part_test_int4_ops
     FOR TYPE integer USING hash FAMILY public.part_test_int4_ops AS
-    OPERATOR 1 =(integer,integer) ,
-    FUNCTION 2 (integer, integer) public.part_hashint4_noop(integer,bigint);
+    OPERATOR 1 =(integer,integer);
 
 
 ALTER OPERATOR CLASS public.part_test_int4_ops USING hash OWNER TO buildfarm;
@@ -181328,6 +181334,8 @@
 --
 
 CREATE OPERATOR FAMILY public.part_test_text_ops USING hash;
+ALTER OPERATOR FAMILY public.part_test_text_ops USING hash ADD
+    FUNCTION 2 (text, text) public.part_hashtext_length(text,bigint);
 
 
 ALTER OPERATOR FAMILY public.part_test_text_ops USING hash OWNER TO buildfarm;
@@ -181338,8 +181346,7 @@
 
 CREATE OPERATOR CLASS public.part_test_text_ops
     FOR TYPE text USING hash FAMILY public.part_test_text_ops AS
-    OPERATOR 1 =(text,text) ,
-    FUNCTION 2 (text, text) public.part_hashtext_length(text,bigint);
+    OPERATOR 1 =(text,text);
 
 
 ALTER OPERATOR CLASS public.part_test_text_ops USING hash OWNER TO buildfarm;

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 1ba326decd..8593488907 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -23,7 +23,8 @@ standard_initdb() {
 	# To increase coverage of non-standard segment size and group access
 	# without increasing test runtime, run these tests with a custom setting.
 	# Also, specify "-A trust" explicitly to suppress initdb's warning.
-	"$1" -N --wal-segsize 1 -g -A trust
+	# --allow-group-access and --wal-segsize have been added in v11.
+	"$1" -N --wal-segsize 1 --allow-group-access -A trust
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@@ -107,6 +108,14 @@ EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --outputdir=$outputdir"
 export EXTRA_REGRESS_OPTS
 mkdir "$outputdir"
 
+# pg_regress --make-tablespacedir would take care of that in 14~, but this is
+# still required for older versions where this option is not supported.
+if [ "$newsrc" != "$oldsrc" ]; then
+	mkdir "$outputdir"/testtablespace
+	mkdir "$outputdir"/sql
+	mkdir "$outputdir"/expected
+fi
+
 logdir=`pwd`/log
 rm -rf "$logdir"
 mkdir "$logdir"
@@ -163,20 +172,32 @@ createdb "regression$dbname1" || createdb_status=$?
 createdb "regression$dbname2" || createdb_status=$?
 createdb "regression$dbname3" || createdb_status=$?
 
+# Extra options to apply to the dump.  This may be changed later.
+extra_dump_options=""
+
 if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 	oldpgversion=`psql -X -A -t -d regression -c "SHOW server_version_num"`
 
-	# before dumping, get rid of objects not feasible in later versions
+	# Before dumping, tweak the database of the old instance depending
+	# on its version.
 	if [ "$newsrc" != "$oldsrc" ]; then
 		fix_sql=""
+		# Get rid of objects not feasible in later versions
 		case $oldpgversion in
 			804??)
 				fix_sql="DROP FUNCTION public.myfunc(integer);"
 				;;
 		esac
-		fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.oldstyle_length(integer, text);	-- last in 9.6
+
+		# Last appeared in v9.6
+		if [ $oldpgversion -lt 100000 ]; then
+			fix_sql="$fix_sql
+					 DROP FUNCTION IF EXISTS
+						public.oldstyle_length(integer, text);"
+		fi
+		# Last appeared in v13
+		if [ $oldpgversion -lt 140000 ]; then
+			fix_sql="$fix_sql
 				 DROP FUNCTION IF EXISTS
 					public.putenv(text);	-- last in v13
 				 DROP OPERATOR IF EXISTS	-- last in v13
@@ -184,10 +205,40 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 					public.#%# (pg_catalog.int8, NONE),
 					public.!=- (pg_catalog.int8, NONE),
 					public.#@%# (pg_catalog.int8, NONE);"
+		fi
 		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
+
+		# WITH OIDS is not supported anymore in v12, so remove support
+		# for any relations marked as such.
+		if [ $oldpgversion -lt 120000 ]; then
+			fix_sql="DO \$stmt\$
+				DECLARE
+					rec text;
+				BEGIN
+				FOR rec in
+					SELECT oid::regclass::text
+					FROM pg_class
+					WHERE relname !~ '^pg_'
+						AND relhasoids
+						AND relkind in ('r','m')
+					ORDER BY 1
+				LOOP
+					execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
+				END LOOP;
+				END; \$stmt\$;"
+			psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
+		fi
+
+		# Handling of --extra-float-digits gets messy after v12.
+		# Note that this changes the dumps from the old and new
+		# instances if involving an old cluster of v11 or older.
+		if [ $oldpgversion -lt 120000 ]; then
+			extra_dump_options="--extra-float-digits=0"
+		fi
 	fi
 
-	pg_dumpall --no-sync -f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
+	pg_dumpall $extra_dump_options --no-sync \
+		-f "$temp_root"/dump1.sql || pg_dumpall1_status=$?
 
 	if [ "$newsrc" != "$oldsrc" ]; then
 		# update references to old source tree's regress.so etc
@@ -249,7 +300,8 @@ esac
 
 pg_ctl start -l "$logdir/postmaster2.log" -o "$POSTMASTER_OPTS" -w
 
-pg_dumpall --no-sync -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
+pg_dumpall $extra_dump_options --no-sync \
+	-f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
 pg_ctl -m fast stop
 
 if [ -n "$pg_dumpall2_status" ]; then

From 50261556825655c0f78459dd2a1cc310d88f55d6 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 5 Dec 2020 17:20:09 -0600
Subject: [PATCH v6 1/2] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes to notice if the
binary format is accidentally changed again, as happened at:
7c15cef86 Base information_schema.sql_identifier domain on name, not varchar.

I checked that if I cherry-pick to v11, and comment out
old_11_check_for_sql_identifier_data_type_usage(), then pg_upgrade/test.sh
detects the original problem:
pg_dump: error: Error message from server: ERROR:  invalid memory alloc request size 18446744073709551613

I understand the buildfarm has its own cross-version-upgrade test, which I
think would catch this on its own.
---
 src/test/regress/expected/sanity_check.out |  1 +
 src/test/regress/expected/type_sanity.out  | 55 ++++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 54 +++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index d04dc66db9..b4880ea3af 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -69,6 +69,7 @@ line_tbl|f
 log_table|f
 lseg_tbl|f
 main_table|f
+manytypes|f
 mlparted|f
 mlparted1|f
 mlparted11|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index f567fd378e..58013a8df3 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -674,3 +674,58 @@ WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
 ----------+------------+---------------
 (0 rows)
 
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'foo'::"char", 'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type, 'pg_monitor'::regrole,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot, '16/B374D848'::pg_lsn,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no,
+'venus'::planets, 'i16'::insenum,
+'(1,2)'::int4range, '{(1,2)}'::int4multirange,
+'(3,4)'::int8range, '{(3,4)}'::int8multirange,
+'(1,2)'::float8range, '{(1,2)}'::float8multirange,
+'(3,4)'::numrange, '{(3,4)}'::nummultirange,
+'(a,b)'::textrange, '{(a,b)}'::textmultirange,
+'(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+'(2020-01-02, 2021-02-03)'::daterange,
+'{(2020-01-02, 2021-02-03)}'::datemultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+arrayrange(ARRAY[1,2], ARRAY[2,1]),
+arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+-- And now a test on the previous test, checking that all core types are
+-- included in this table
+-- XXX or some other non-catalog table processed by pg_upgrade
+SELECT oid, typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typtype NOT IN ('p', 'c')
+-- reg* which cannot be pg_upgraded
+AND oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper', 'regoperator', 'regconfig', 'regdictionary', 'regnamespace', 'regcollation']::regtype[])
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['xml', 'gtsvector', 'pg_node_tree', 'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list', 'pg_brin_bloom_summary', 'pg_brin_minmax_multi_summary']::regtype[])
+AND NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray=t.oid) -- exclude arrays
+AND NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
+ oid | typname | typtype | typelem | typarray | typarray 
+-----+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 404c3a2043..e98191f01f 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -495,3 +495,57 @@ WHERE pronargs != 2
 SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
 FROM pg_range p1
 WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
+
+-- Create a table with different data types, to exercise binary compatibility
+-- during pg_upgrade test
+
+CREATE TABLE manytypes AS SELECT
+'(11,12)'::point, '(1,1),(2,2)'::line,
+'((11,11),(12,12))'::lseg, '((11,11),(13,13))'::box,
+'((11,12),(13,13),(14,14))'::path AS openedpath, '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+'((11,12),(13,13),(14,14))'::polygon, '1,1,1'::circle,
+'today'::date, 'now'::time, 'now'::timestamp, 'now'::timetz, 'now'::timestamptz, '12 seconds'::interval,
+'{"reason":"because"}'::json, '{"when":"now"}'::jsonb, '$.a[*] ? (@ > 2)'::jsonpath,
+'127.0.0.1'::inet, '127.0.0.0/8'::cidr, '00:01:03:86:1c:ba'::macaddr8, '00:01:03:86:1c:ba'::macaddr,
+2::int2, 4::int4, 8::int8, 4::float4, '8'::float8, pi()::numeric,
+'foo'::"char", 'c'::bpchar, 'abc'::varchar, 'name'::name, 'txt'::text, true::bool,
+E'\\xDEADBEEF'::bytea, B'10001'::bit, B'10001'::varbit AS varbit, '12.34'::money,
+'abc'::refcursor,
+'1 2'::int2vector, '1 2'::oidvector, format('%s=UC/%s', USER, USER)::aclitem,
+'a fat cat sat on a mat and ate a fat rat'::tsvector, 'fat & rat'::tsquery,
+'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid, '11'::xid8,
+'pg_class'::regclass, 'regtype'::regtype type, 'pg_monitor'::regrole,
+'pg_class'::regclass::oid, '(1,1)'::tid, '2'::xid, '3'::cid,
+'10:20:10,14,15'::txid_snapshot, '10:20:10,14,15'::pg_snapshot, '16/B374D848'::pg_lsn,
+1::information_schema.cardinal_number,
+'l'::information_schema.character_data,
+'n'::information_schema.sql_identifier,
+'now'::information_schema.time_stamp,
+'YES'::information_schema.yes_or_no,
+'venus'::planets, 'i16'::insenum,
+'(1,2)'::int4range, '{(1,2)}'::int4multirange,
+'(3,4)'::int8range, '{(3,4)}'::int8multirange,
+'(1,2)'::float8range, '{(1,2)}'::float8multirange,
+'(3,4)'::numrange, '{(3,4)}'::nummultirange,
+'(a,b)'::textrange, '{(a,b)}'::textmultirange,
+'(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+'(2020-01-02, 2021-02-03)'::daterange,
+'{(2020-01-02, 2021-02-03)}'::datemultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+'(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+'{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+arrayrange(ARRAY[1,2], ARRAY[2,1]),
+arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+
+-- And now a test on the previous test, checking that all core types are
+-- included in this table
+-- XXX or some other non-catalog table processed by pg_upgrade
+SELECT oid, typname, typtype, typelem, typarray, typarray FROM pg_type t
+WHERE typtype NOT IN ('p', 'c')
+-- reg* which cannot be pg_upgraded
+AND oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper', 'regoperator', 'regconfig', 'regdictionary', 'regnamespace', 'regcollation']::regtype[])
+-- XML might be disabled at compile-time
+AND oid != ALL(ARRAY['xml', 'gtsvector', 'pg_node_tree', 'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list', 'pg_brin_bloom_summary', 'pg_brin_minmax_multi_summary']::regtype[])
+AND NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray=t.oid) -- exclude arrays
+AND NOT EXISTS (SELECT 1 FROM pg_attribute a WHERE a.atttypid=t.oid AND a.attnum>0 AND a.attrelid='manytypes'::regclass);
-- 
2.17.0

From 5ab4b974464f9732d5c9362f3b92cd33653864b3 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 6 Mar 2021 18:35:26 -0600
Subject: [PATCH v6 2/2] Move pg_upgrade kludges to sql script

NOTE, "IF EXISTS" isn't necessary in fa66b6dee
---
 src/bin/pg_upgrade/test-upgrade.sql | 51 +++++++++++++++++++++++++++++
 src/bin/pg_upgrade/test.sh          | 48 +--------------------------
 2 files changed, 52 insertions(+), 47 deletions(-)
 create mode 100644 src/bin/pg_upgrade/test-upgrade.sql

diff --git a/src/bin/pg_upgrade/test-upgrade.sql b/src/bin/pg_upgrade/test-upgrade.sql
new file mode 100644
index 0000000000..74fad312cb
--- /dev/null
+++ b/src/bin/pg_upgrade/test-upgrade.sql
@@ -0,0 +1,51 @@
+-- This file has a bunch of kludges needed for testing upgrades across major versions
+-- It supports testing the most recent version of an old release (not any arbitrary minor version).
+
+SELECT
+	ver <= 804 AS oldpgversion_le84,
+	ver < 1000 AS oldpgversion_lt10,
+	ver < 1200 AS oldpgversion_lt12,
+	ver < 1400 AS oldpgversion_lt14
+	FROM (SELECT current_setting('server_version_num')::int/100 AS ver) AS v;
+\gset
+
+\if :oldpgversion_le84
+DROP FUNCTION public.myfunc(integer);
+\endif
+
+\if :oldpgversion_lt10
+-- last in 9.6 -- commit 5ded4bd21
+DROP FUNCTION public.oldstyle_length(integer, text);
+\endif
+
+\if :oldpgversion_lt14
+-- last in v13 commit 7ca37fb04
+DROP FUNCTION IF EXISTS public.putenv(text);
+-- last in v13 commit 76f412ab3
+-- public.!=- This one is only needed for v11+ ??
+-- Note, until v10, operators could only be dropped one at a time
+DROP OPERATOR public.#@# (pg_catalog.int8, NONE);
+DROP OPERATOR public.#%# (pg_catalog.int8, NONE);
+DROP OPERATOR public.!=- (pg_catalog.int8, NONE);
+DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);
+\endif
+
+\if :oldpgversion_lt12
+-- WITH OIDS is not supported anymore in v12, so remove support
+-- for any relations marked as such.
+DO $stmt$
+	DECLARE
+		rec text;
+	BEGIN
+	FOR rec in
+		SELECT oid::regclass::text
+		FROM pg_class
+		WHERE relname !~ '^pg_'
+			AND relhasoids
+			AND relkind in ('r','m')
+		ORDER BY 1
+	LOOP
+		execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
+	END LOOP;
+	END; $stmt$;
+\endif
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 8593488907..46a1ebb4ab 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -181,53 +181,7 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 	# Before dumping, tweak the database of the old instance depending
 	# on its version.
 	if [ "$newsrc" != "$oldsrc" ]; then
-		fix_sql=""
-		# Get rid of objects not feasible in later versions
-		case $oldpgversion in
-			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer);"
-				;;
-		esac
-
-		# Last appeared in v9.6
-		if [ $oldpgversion -lt 100000 ]; then
-			fix_sql="$fix_sql
-					 DROP FUNCTION IF EXISTS
-						public.oldstyle_length(integer, text);"
-		fi
-		# Last appeared in v13
-		if [ $oldpgversion -lt 140000 ]; then
-			fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.putenv(text);	-- last in v13
-				 DROP OPERATOR IF EXISTS	-- last in v13
-					public.#@# (pg_catalog.int8, NONE),
-					public.#%# (pg_catalog.int8, NONE),
-					public.!=- (pg_catalog.int8, NONE),
-					public.#@%# (pg_catalog.int8, NONE);"
-		fi
-		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
-
-		# WITH OIDS is not supported anymore in v12, so remove support
-		# for any relations marked as such.
-		if [ $oldpgversion -lt 120000 ]; then
-			fix_sql="DO \$stmt\$
-				DECLARE
-					rec text;
-				BEGIN
-				FOR rec in
-					SELECT oid::regclass::text
-					FROM pg_class
-					WHERE relname !~ '^pg_'
-						AND relhasoids
-						AND relkind in ('r','m')
-					ORDER BY 1
-				LOOP
-					execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
-				END LOOP;
-				END; \$stmt\$;"
-			psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
-		fi
+		psql -X -d regression -f "test-upgrade.sql" || psql_fix_sql_status=$?
 
 		# Handling of --extra-float-digits gets messy after v12.
 		# Note that this changes the dumps from the old and new
-- 
2.17.0

From c4d766f9a461dad2d51cba3cb8d7d0c523267716 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Wed, 17 Nov 2021 15:57:04 +0900
Subject: [PATCH v7] pg_upgrade: test to exercise binary compatibility

Creating a table with columns of many different datatypes to notice if the
binary format is accidentally changed again, as happened at:
7c15cef86 Base information_schema.sql_identifier domain on name, not varchar.

I checked that if I cherry-pick to v11, and comment out
old_11_check_for_sql_identifier_data_type_usage(), then pg_upgrade/test.sh
detects the original problem:
pg_dump: error: Error message from server: ERROR:  invalid memory alloc request size 18446744073709551613

I understand the buildfarm has its own cross-version-upgrade test, which I
think would catch this on its own.
---
 src/test/regress/expected/sanity_check.out |   1 +
 src/test/regress/expected/type_sanity.out  | 102 +++++++++++++++++++++
 src/test/regress/sql/type_sanity.sql       | 100 ++++++++++++++++++++
 3 files changed, 203 insertions(+)

diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index d04dc66db9..63706a28cc 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -185,6 +185,7 @@ sql_parts|f
 sql_sizing|f
 stud_emp|f
 student|f
+tab_core_types|f
 tableam_parted_a_heap2|f
 tableam_parted_b_heap2|f
 tableam_parted_c_heap2|f
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index f567fd378e..3ffd9d0d71 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -674,3 +674,105 @@ WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
 ----------+------------+---------------
 (0 rows)
 
+-- Create a table that holds all the known in-core data types and leave it
+-- around so as pg_upgrade is able to test their binary compatibility.
+CREATE TABLE tab_core_types AS SELECT
+  '(11,12)'::point,
+  '(1,1),(2,2)'::line,
+  '((11,11),(12,12))'::lseg,
+  '((11,11),(13,13))'::box,
+  '((11,12),(13,13),(14,14))'::path AS openedpath,
+  '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+  '((11,12),(13,13),(14,14))'::polygon,
+  '1,1,1'::circle,
+  'today'::date,
+  'now'::time,
+  'now'::timestamp,
+  'now'::timetz,
+  'now'::timestamptz,
+  '12 seconds'::interval,
+  '{"reason":"because"}'::json,
+  '{"when":"now"}'::jsonb,
+  '$.a[*] ? (@ > 2)'::jsonpath,
+  '127.0.0.1'::inet,
+  '127.0.0.0/8'::cidr,
+  '00:01:03:86:1c:ba'::macaddr8,
+  '00:01:03:86:1c:ba'::macaddr,
+  2::int2, 4::int4, 8::int8,
+  4::float4, '8'::float8, pi()::numeric,
+  'foo'::"char",
+  'c'::bpchar,
+  'abc'::varchar,
+  'name'::name,
+  'txt'::text,
+  true::bool,
+  E'\\xDEADBEEF'::bytea,
+  B'10001'::bit,
+  B'10001'::varbit AS varbit,
+  '12.34'::money,
+  'abc'::refcursor,
+  '1 2'::int2vector,
+  '1 2'::oidvector,
+  format('%s=UC/%s', USER, USER)::aclitem,
+  'a fat cat sat on a mat and ate a fat rat'::tsvector,
+  'fat & rat'::tsquery,
+  'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid,
+  '11'::xid8,
+  'pg_class'::regclass,
+  'regtype'::regtype type,
+  'pg_monitor'::regrole,
+  'pg_class'::regclass::oid,
+  '(1,1)'::tid, '2'::xid, '3'::cid,
+  '10:20:10,14,15'::txid_snapshot,
+  '10:20:10,14,15'::pg_snapshot,
+  '16/B374D848'::pg_lsn,
+  1::information_schema.cardinal_number,
+  'l'::information_schema.character_data,
+  'n'::information_schema.sql_identifier,
+  'now'::information_schema.time_stamp,
+  'YES'::information_schema.yes_or_no,
+  'venus'::planets,
+  'i16'::insenum,
+  '(1,2)'::int4range, '{(1,2)}'::int4multirange,
+  '(3,4)'::int8range, '{(3,4)}'::int8multirange,
+  '(1,2)'::float8range, '{(1,2)}'::float8multirange,
+  '(3,4)'::numrange, '{(3,4)}'::nummultirange,
+  '(a,b)'::textrange, '{(a,b)}'::textmultirange,
+  '(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+  '(2020-01-02, 2021-02-03)'::daterange,
+  '{(2020-01-02, 2021-02-03)}'::datemultirange,
+  '(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+  '{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+  '(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+  '{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+  arrayrange(ARRAY[1,2], ARRAY[2,1]),
+  arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+-- Sanity check on the previous table, checking that all core types are
+-- included in this table.
+SELECT oid, typname, typtype, typelem, typarray, typarray
+  FROM pg_type t
+  WHERE typtype NOT IN ('p', 'c') AND
+    -- reg* types cannot be pg_upgraded, so discard them.
+    oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper',
+                     'regoperator', 'regconfig', 'regdictionary',
+                     'regnamespace', 'regcollation']::regtype[]) AND
+    -- Discard types that do not accept input values as these cannot be
+    -- tested easily.
+    -- Note: XML might be disabled at compile-time.
+    oid != ALL(ARRAY['gtsvector', 'pg_node_tree',
+                     'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list',
+                     'pg_brin_bloom_summary',
+                     'pg_brin_minmax_multi_summary', 'xml']::regtype[]) AND
+    -- Discard arrays.
+    NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray = t.oid)
+    -- Exclude everything from the table created above.  This checks
+    -- that no in-core types are missing in tab_core_types.
+    AND NOT EXISTS (SELECT 1
+                    FROM pg_attribute a
+                    WHERE a.atttypid=t.oid AND
+                          a.attnum > 0 AND
+                          a.attrelid='tab_core_types'::regclass);
+ oid | typname | typtype | typelem | typarray | typarray 
+-----+---------+---------+---------+----------+----------
+(0 rows)
+
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 404c3a2043..f92773b75e 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -495,3 +495,103 @@ WHERE pronargs != 2
 SELECT p1.rngtypid, p1.rngsubtype, p1.rngmultitypid
 FROM pg_range p1
 WHERE p1.rngmultitypid IS NULL OR p1.rngmultitypid = 0;
+
+-- Create a table that holds all the known in-core data types and leave it
+-- around so as pg_upgrade is able to test their binary compatibility.
+CREATE TABLE tab_core_types AS SELECT
+  '(11,12)'::point,
+  '(1,1),(2,2)'::line,
+  '((11,11),(12,12))'::lseg,
+  '((11,11),(13,13))'::box,
+  '((11,12),(13,13),(14,14))'::path AS openedpath,
+  '[(11,12),(13,13),(14,14)]'::path AS closedpath,
+  '((11,12),(13,13),(14,14))'::polygon,
+  '1,1,1'::circle,
+  'today'::date,
+  'now'::time,
+  'now'::timestamp,
+  'now'::timetz,
+  'now'::timestamptz,
+  '12 seconds'::interval,
+  '{"reason":"because"}'::json,
+  '{"when":"now"}'::jsonb,
+  '$.a[*] ? (@ > 2)'::jsonpath,
+  '127.0.0.1'::inet,
+  '127.0.0.0/8'::cidr,
+  '00:01:03:86:1c:ba'::macaddr8,
+  '00:01:03:86:1c:ba'::macaddr,
+  2::int2, 4::int4, 8::int8,
+  4::float4, '8'::float8, pi()::numeric,
+  'foo'::"char",
+  'c'::bpchar,
+  'abc'::varchar,
+  'name'::name,
+  'txt'::text,
+  true::bool,
+  E'\\xDEADBEEF'::bytea,
+  B'10001'::bit,
+  B'10001'::varbit AS varbit,
+  '12.34'::money,
+  'abc'::refcursor,
+  '1 2'::int2vector,
+  '1 2'::oidvector,
+  format('%s=UC/%s', USER, USER)::aclitem,
+  'a fat cat sat on a mat and ate a fat rat'::tsvector,
+  'fat & rat'::tsquery,
+  'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid,
+  '11'::xid8,
+  'pg_class'::regclass,
+  'regtype'::regtype type,
+  'pg_monitor'::regrole,
+  'pg_class'::regclass::oid,
+  '(1,1)'::tid, '2'::xid, '3'::cid,
+  '10:20:10,14,15'::txid_snapshot,
+  '10:20:10,14,15'::pg_snapshot,
+  '16/B374D848'::pg_lsn,
+  1::information_schema.cardinal_number,
+  'l'::information_schema.character_data,
+  'n'::information_schema.sql_identifier,
+  'now'::information_schema.time_stamp,
+  'YES'::information_schema.yes_or_no,
+  'venus'::planets,
+  'i16'::insenum,
+  '(1,2)'::int4range, '{(1,2)}'::int4multirange,
+  '(3,4)'::int8range, '{(3,4)}'::int8multirange,
+  '(1,2)'::float8range, '{(1,2)}'::float8multirange,
+  '(3,4)'::numrange, '{(3,4)}'::nummultirange,
+  '(a,b)'::textrange, '{(a,b)}'::textmultirange,
+  '(12.34, 56.78)'::cashrange, '{(12.34, 56.78)}'::cashmultirange,
+  '(2020-01-02, 2021-02-03)'::daterange,
+  '{(2020-01-02, 2021-02-03)}'::datemultirange,
+  '(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tsrange,
+  '{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tsmultirange,
+  '(2020-01-02 03:04:05, 2021-02-03 06:07:08)'::tstzrange,
+  '{(2020-01-02 03:04:05, 2021-02-03 06:07:08)}'::tstzmultirange,
+  arrayrange(ARRAY[1,2], ARRAY[2,1]),
+  arraymultirange(arrayrange(ARRAY[1,2], ARRAY[2,1]));
+
+-- Sanity check on the previous table, checking that all core types are
+-- included in this table.
+SELECT oid, typname, typtype, typelem, typarray, typarray
+  FROM pg_type t
+  WHERE typtype NOT IN ('p', 'c') AND
+    -- reg* types cannot be pg_upgraded, so discard them.
+    oid != ALL(ARRAY['regproc', 'regprocedure', 'regoper',
+                     'regoperator', 'regconfig', 'regdictionary',
+                     'regnamespace', 'regcollation']::regtype[]) AND
+    -- Discard types that do not accept input values as these cannot be
+    -- tested easily.
+    -- Note: XML might be disabled at compile-time.
+    oid != ALL(ARRAY['gtsvector', 'pg_node_tree',
+                     'pg_ndistinct', 'pg_dependencies', 'pg_mcv_list',
+                     'pg_brin_bloom_summary',
+                     'pg_brin_minmax_multi_summary', 'xml']::regtype[]) AND
+    -- Discard arrays.
+    NOT EXISTS (SELECT 1 FROM pg_type u WHERE u.typarray = t.oid)
+    -- Exclude everything from the table created above.  This checks
+    -- that no in-core types are missing in tab_core_types.
+    AND NOT EXISTS (SELECT 1
+                    FROM pg_attribute a
+                    WHERE a.atttypid=t.oid AND
+                          a.attnum > 0 AND
+                          a.attrelid='tab_core_types'::regclass);
-- 
2.33.1

From 2e420708f28574e73a86f8eba185d89a52d46509 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 6 Mar 2021 18:35:26 -0600
Subject: [PATCH v7 1/2] Move pg_upgrade kludges to sql script

NOTE, "IF EXISTS" isn't necessary in fa66b6dee
---
 src/bin/pg_upgrade/test-upgrade.sql | 52 +++++++++++++++++++++++++++++
 src/bin/pg_upgrade/test.sh          | 48 +-------------------------
 2 files changed, 53 insertions(+), 47 deletions(-)
 create mode 100644 src/bin/pg_upgrade/test-upgrade.sql

diff --git a/src/bin/pg_upgrade/test-upgrade.sql b/src/bin/pg_upgrade/test-upgrade.sql
new file mode 100644
index 0000000000..5d74232c2b
--- /dev/null
+++ b/src/bin/pg_upgrade/test-upgrade.sql
@@ -0,0 +1,52 @@
+-- This file has a bunch of kludges needed for testing upgrades across major versions
+-- It supports testing the most recent version of an old release (not any arbitrary minor version).
+
+SELECT
+	ver <= 804 AS oldpgversion_le84,
+	ver < 1000 AS oldpgversion_lt10,
+	ver < 1200 AS oldpgversion_lt12,
+	ver < 1400 AS oldpgversion_lt14
+	FROM (SELECT current_setting('server_version_num')::int/100 AS ver) AS v;
+\gset
+
+\if :oldpgversion_le84
+DROP FUNCTION public.myfunc(integer);
+\endif
+
+\if :oldpgversion_lt10
+-- last in 9.6 -- commit 5ded4bd21
+DROP FUNCTION public.oldstyle_length(integer, text);
+\endif
+
+\if :oldpgversion_lt14
+-- last in v13 commit 7ca37fb04
+DROP FUNCTION IF EXISTS public.putenv(text);
+
+-- last in v13 commit 76f412ab3
+-- public.!=- This one is only needed for v11+ ??
+-- Note, until v10, operators could only be dropped one at a time
+DROP OPERATOR public.#@# (pg_catalog.int8, NONE);
+DROP OPERATOR public.#%# (pg_catalog.int8, NONE);
+DROP OPERATOR public.!=- (pg_catalog.int8, NONE);
+DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);
+\endif
+
+\if :oldpgversion_lt12
+-- WITH OIDS is not supported anymore in v12, so remove support
+-- for any relations marked as such.
+DO $stmt$
+	DECLARE
+		rec text;
+	BEGIN
+	FOR rec in
+		SELECT oid::regclass::text
+		FROM pg_class
+		WHERE relname !~ '^pg_'
+			AND relhasoids
+			AND relkind in ('r','m')
+		ORDER BY 1
+	LOOP
+		execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
+	END LOOP;
+	END; $stmt$;
+\endif
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 8593488907..46a1ebb4ab 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -181,53 +181,7 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 	# Before dumping, tweak the database of the old instance depending
 	# on its version.
 	if [ "$newsrc" != "$oldsrc" ]; then
-		fix_sql=""
-		# Get rid of objects not feasible in later versions
-		case $oldpgversion in
-			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer);"
-				;;
-		esac
-
-		# Last appeared in v9.6
-		if [ $oldpgversion -lt 100000 ]; then
-			fix_sql="$fix_sql
-					 DROP FUNCTION IF EXISTS
-						public.oldstyle_length(integer, text);"
-		fi
-		# Last appeared in v13
-		if [ $oldpgversion -lt 140000 ]; then
-			fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.putenv(text);	-- last in v13
-				 DROP OPERATOR IF EXISTS	-- last in v13
-					public.#@# (pg_catalog.int8, NONE),
-					public.#%# (pg_catalog.int8, NONE),
-					public.!=- (pg_catalog.int8, NONE),
-					public.#@%# (pg_catalog.int8, NONE);"
-		fi
-		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
-
-		# WITH OIDS is not supported anymore in v12, so remove support
-		# for any relations marked as such.
-		if [ $oldpgversion -lt 120000 ]; then
-			fix_sql="DO \$stmt\$
-				DECLARE
-					rec text;
-				BEGIN
-				FOR rec in
-					SELECT oid::regclass::text
-					FROM pg_class
-					WHERE relname !~ '^pg_'
-						AND relhasoids
-						AND relkind in ('r','m')
-					ORDER BY 1
-				LOOP
-					execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
-				END LOOP;
-				END; \$stmt\$;"
-			psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
-		fi
+		psql -X -d regression -f "test-upgrade.sql" || psql_fix_sql_status=$?
 
 		# Handling of --extra-float-digits gets messy after v12.
 		# Note that this changes the dumps from the old and new
-- 
2.17.0

From 79242aed5b38f7498a089c6cd972ca24f8e357d1 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 17 Nov 2021 11:27:20 -0600
Subject: [PATCH v7 2/2] wip: support pg_upgrade from older versions

---
 src/bin/pg_upgrade/test-upgrade.sql | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/bin/pg_upgrade/test-upgrade.sql b/src/bin/pg_upgrade/test-upgrade.sql
index 5d74232c2b..1d0a840ec4 100644
--- a/src/bin/pg_upgrade/test-upgrade.sql
+++ b/src/bin/pg_upgrade/test-upgrade.sql
@@ -3,6 +3,9 @@
 
 SELECT
 	ver <= 804 AS oldpgversion_le84,
+	ver >= 905 AND ver <= 1300 AS oldpgversion_95_13,
+	ver >= 906 AND ver <= 1300 AS oldpgversion_96_13,
+	ver >= 906 AND ver <= 1000 AS oldpgversion_96_10,
 	ver < 1000 AS oldpgversion_lt10,
 	ver < 1200 AS oldpgversion_lt12,
 	ver < 1400 AS oldpgversion_lt14
@@ -31,9 +34,42 @@ DROP OPERATOR public.!=- (pg_catalog.int8, NONE);
 DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);
 \endif
 
+\if :oldpgversion_ge10
+-- commit 068503c76511cdb0080bab689662a20e86b9c845
+DROP TRANSFORM FOR integer LANGUAGE sql CASCADE;
+\endif
+
+\if :oldpgversion_96_10
+-- commit db3af9feb19f39827e916145f88fa5eca3130cb2
+DROP FUNCTION boxarea(box);
+DROP FUNCTION funny_dup17();
+
+-- commit cda6a8d01d391eab45c4b3e0043a1b2b31072f5f
+DROP TABLE abstime_tbl;
+DROP TABLE reltime_tbl;
+DROP TABLE tinterval_tbl;
+\endif
+
+\if :oldpgversion_96_13
+-- Various things removed for v14
+-- commit 9e38c2bb5 and 97f73a978
+DROP AGGREGATE first_el_agg_any(anyelement);
+\endif
+
+\if :oldpgversion_95_13
+-- commit 9e38c2bb5 and 97f73a978
+-- DROP AGGREGATE array_larger_accum(anyarray);
+DROP AGGREGATE array_cat_accum(anyarray);
+
+-- commit 76f412ab3
+-- DROP OPERATOR @#@(bigint,NONE);
+DROP OPERATOR @#@(NONE,bigint);
+\endif
+
 \if :oldpgversion_lt12
 -- WITH OIDS is not supported anymore in v12, so remove support
 -- for any relations marked as such.
+-- commit 578b22971: OIDS removed in v12
 DO $stmt$
 	DECLARE
 		rec text;
-- 
2.17.0

From 9bfe54d8867c9c05a36976f01ed65e5b8da442f7 Mon Sep 17 00:00:00 2001
From: Michael Paquier <michael@paquier.xyz>
Date: Wed, 1 Dec 2021 16:08:01 +0900
Subject: [PATCH] Move SQLs for cleanups before cross-version upgrades into a
 new file

The plan is to make the buildfarm code re-use this code, and test.sh
held a duplicated logic for this work.  Separating those SQLs into a new
file with a set of \if clauses to do version checks with the old version
upgrading will allow the buildfarm to reuse that.  An extra
simplification is that committers will be able to control the objects
cleaned up without any need to tweak the buldfarm code, at least for the
main regression test suite.

Backpatch down to 10, to maximize its effects.
---
 src/bin/pg_upgrade/test.sh           | 52 ++--------------
 src/bin/pg_upgrade/upgrade_adapt.sql | 92 ++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+), 47 deletions(-)
 create mode 100644 src/bin/pg_upgrade/upgrade_adapt.sql

diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 8593488907..54c02bc65b 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -181,53 +181,11 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then
 	# Before dumping, tweak the database of the old instance depending
 	# on its version.
 	if [ "$newsrc" != "$oldsrc" ]; then
-		fix_sql=""
-		# Get rid of objects not feasible in later versions
-		case $oldpgversion in
-			804??)
-				fix_sql="DROP FUNCTION public.myfunc(integer);"
-				;;
-		esac
-
-		# Last appeared in v9.6
-		if [ $oldpgversion -lt 100000 ]; then
-			fix_sql="$fix_sql
-					 DROP FUNCTION IF EXISTS
-						public.oldstyle_length(integer, text);"
-		fi
-		# Last appeared in v13
-		if [ $oldpgversion -lt 140000 ]; then
-			fix_sql="$fix_sql
-				 DROP FUNCTION IF EXISTS
-					public.putenv(text);	-- last in v13
-				 DROP OPERATOR IF EXISTS	-- last in v13
-					public.#@# (pg_catalog.int8, NONE),
-					public.#%# (pg_catalog.int8, NONE),
-					public.!=- (pg_catalog.int8, NONE),
-					public.#@%# (pg_catalog.int8, NONE);"
-		fi
-		psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
-
-		# WITH OIDS is not supported anymore in v12, so remove support
-		# for any relations marked as such.
-		if [ $oldpgversion -lt 120000 ]; then
-			fix_sql="DO \$stmt\$
-				DECLARE
-					rec text;
-				BEGIN
-				FOR rec in
-					SELECT oid::regclass::text
-					FROM pg_class
-					WHERE relname !~ '^pg_'
-						AND relhasoids
-						AND relkind in ('r','m')
-					ORDER BY 1
-				LOOP
-					execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
-				END LOOP;
-				END; \$stmt\$;"
-			psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$?
-		fi
+		# This SQL script has its own idea of the cleanup that needs to be
+		# done and embeds version checks.  Note that this uses the script
+		# stored on the new branch.
+		psql -X -d regression -f "$newsrc/src/bin/pg_upgrade/upgrade_adapt.sql" \
+			|| psql_fix_sql_status=$?
 
 		# Handling of --extra-float-digits gets messy after v12.
 		# Note that this changes the dumps from the old and new
diff --git a/src/bin/pg_upgrade/upgrade_adapt.sql b/src/bin/pg_upgrade/upgrade_adapt.sql
new file mode 100644
index 0000000000..175b2ebe2e
--- /dev/null
+++ b/src/bin/pg_upgrade/upgrade_adapt.sql
@@ -0,0 +1,92 @@
+--
+-- SQL queries for upgrade tests across different major versions.
+--
+-- This file includes a set of SQL queries to make a cluster to-be-upgraded
+-- compatible with the version this file is based on.  Note that this
+-- requires psql, as per-version queries are controlled with a set of \if
+-- clauses.
+
+-- This script is backward-compatible, so it is able to work with any version
+-- newer than 9.2 we are upgrading from, up to the branch this script is stored
+-- on (even if this would not run if running pg_upgrade with the same version
+-- for the origin and the target).
+
+-- \if accepts a simple boolean value, so all the version checks are
+-- done based on this assumption.
+SELECT
+  ver <= 902 AS oldpgversion_le92,
+  ver <= 904 AS oldpgversion_le94,
+  ver <= 906 AS oldpgversion_le96,
+  ver <= 1000 AS oldpgversion_le10,
+  ver <= 1100 AS oldpgversion_le11,
+  ver <= 1300 AS oldpgversion_le13
+  FROM (SELECT current_setting('server_version_num')::int / 100 AS ver) AS v;
+\gset
+
+-- Objects last appearing in 9.2.
+\if :oldpgversion_le92
+-- Note that those tables are removed from the regression tests in 9.3
+-- and newer versions.
+DROP TABLE abstime_tbl;
+DROP TABLE reltime_tbl;
+DROP TABLE tinterval_tbl;
+\endif
+
+-- Objects last appearing in 9.4.
+\if :oldpgversion_le94
+-- This aggregate has been fixed in 9.5 and later versions, so drop
+-- and re-create it.
+DROP AGGREGATE array_cat_accum(anyarray);
+CREATE AGGREGATE array_larger_accum (anyarray) (
+                  sfunc = array_larger,
+                  stype = anyarray,
+                  initcond = $${}$$);
+-- This operator has been fixed in 9.5 and later versions, so drop and
+-- re-create it.
+DROP OPERATOR @#@ (NONE, bigint);
+CREATE OPERATOR @#@ (PROCEDURE = factorial,
+                     RIGHTARG = bigint);
+\endif
+
+-- Objects last appearing in 9.6.
+\if :oldpgversion_le96
+DROP FUNCTION public.oldstyle_length(integer, text);
+\endif
+
+-- Objects last appearing in 10.
+\if :oldpgversion_le10
+DROP FUNCTION IF EXISTS boxarea(box);
+DROP FUNCTION IF EXISTS funny_dup17();
+\endif
+
+-- Objects last appearing in 11.
+\if :oldpgversion_le11
+-- WITH OIDS is supported until v11, so remove its support for any
+-- relations marked as such.
+DO $stmt$
+  DECLARE
+    rec text;
+  BEGIN
+  FOR rec in
+    SELECT oid::regclass::text
+    FROM pg_class
+    WHERE relname !~ '^pg_'
+      AND relhasoids
+      AND relkind in ('r','m')
+    ORDER BY 1
+  LOOP
+    execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
+  END LOOP;
+  END; $stmt$;
+\endif
+
+-- Objects last appearing in 13.
+\if :oldpgversion_le13
+DROP FUNCTION IF EXISTS public.putenv(text);
+-- Until v10, operators could only be dropped one at a time, so be careful
+-- to stick with one command for each drop here.
+DROP OPERATOR public.#@# (pg_catalog.int8, NONE);
+DROP OPERATOR public.#%# (pg_catalog.int8, NONE);
+DROP OPERATOR public.!=- (pg_catalog.int8, NONE);
+DROP OPERATOR public.#@%# (pg_catalog.int8, NONE);
+\endif
-- 
2.34.0