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