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