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