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