Re: pg_upgrade test for binary compatibility of core data types

[Andrew Dunstan]

On 9/12/21 2:41 PM, Andrew Dunstan wrote:
> On 9/11/21 8:51 PM, Justin Pryzby wrote:
>> @Andrew: did you have any comment on this part ?
>>
>> |Subject: buildfarm xversion diff
>> |Forking 
>> https://www.postgresql.org/message-id/20210328231433.gi15...@telsasoft.com
>> |
>> |I gave suggestion how to reduce the "lines of diff" metric almost to 
>> nothing,
>> |allowing a very small "fudge factor", and which I think makes this a pretty
>> |good metric rather than a passable one.
>>
> Somehow I missed that. Looks like some good suggestions. I'll
> experiment. (Note: we can't assume the presence of sed, especially on
> Windows).
>
>

I tried with the attached patch on crake, which tests back as far as
9.2. Here are the diff counts from HEAD:


andrew@emma:HEAD $ grep -c '^[+-]' dumpdiff-REL9_* dumpdiff-REL_1*
dumpdiff-HEAD
dumpdiff-REL9_2_STABLE:514
dumpdiff-REL9_3_STABLE:169
dumpdiff-REL9_4_STABLE:185
dumpdiff-REL9_5_STABLE:221
dumpdiff-REL9_6_STABLE:11
dumpdiff-REL_10_STABLE:11
dumpdiff-REL_11_STABLE:73
dumpdiff-REL_12_STABLE:73
dumpdiff-REL_13_STABLE:73
dumpdiff-REL_14_STABLE:0
dumpdiff-HEAD:0


I've also attached those non-empty dumpdiff files for information, since
they are quite small.


There is still work to do, but this is promising. Next step: try it on
Windows.


cheers


andrew


-- 

Andrew Dunstan
EDB: https://www.enterprisedb.com


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_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;
 
 

--- /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;