--- /home/bf/bfr/root/upgrade/HEAD/origin-REL9_2_STABLE.sql	2016-05-03 11:51:45.165571140 -0400
+++ /home/bf/bfr/root/upgrade/HEAD/converted-REL9_2_STABLE-to-HEAD.sql	2016-05-03 11:52:58.731569195 -0400
@@ -26,8 +26,6 @@
 --
 
 CREATE DATABASE contrib_regression WITH TEMPLATE = template0 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;
@@ -175,8 +173,6 @@
 ALTER DATABASE pl_regression SET lc_time TO 'C';
 ALTER DATABASE pl_regression SET timezone_abbreviations TO 'Default';
 CREATE DATABASE regression WITH TEMPLATE = template0 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;
 ALTER DATABASE regression SET lc_messages TO 'C';
@@ -184,8 +180,6 @@
 ALTER DATABASE regression SET lc_numeric TO 'C';
 ALTER DATABASE regression SET lc_time TO 'C';
 ALTER DATABASE regression SET timezone_abbreviations TO 'Default';
-REVOKE ALL ON DATABASE template1 FROM PUBLIC;
-REVOKE ALL ON DATABASE template1 FROM buildfarm;
 GRANT ALL ON DATABASE template1 TO buildfarm;
 GRANT CONNECT ON DATABASE template1 TO PUBLIC;
 
@@ -198,7 +192,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -381,13 +375,17 @@
 
 
 --
--- Name: public; Type: ACL; Schema: -; Owner: buildfarm
+-- Name: dblink_connect_u(text); Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM buildfarm;
-GRANT ALL ON SCHEMA public TO buildfarm;
-GRANT ALL ON SCHEMA public TO PUBLIC;
+REVOKE ALL ON FUNCTION dblink_connect_u(text) FROM PUBLIC;
+
+
+--
+-- Name: dblink_connect_u(text, text); Type: ACL; Schema: public; Owner: buildfarm
+--
+
+REVOKE ALL ON FUNCTION dblink_connect_u(text, text) FROM PUBLIC;
 
 
 --
@@ -402,7 +400,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -7474,16 +7472,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -7495,7 +7483,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -8277,16 +8265,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -8298,7 +8276,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -26715,16 +26693,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -26736,7 +26704,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -26929,16 +26897,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -26950,7 +26908,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30122,16 +30080,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30143,7 +30091,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30183,16 +30131,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30204,7 +30142,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30244,16 +30182,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30265,7 +30193,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30316,16 +30244,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30337,7 +30255,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -30363,16 +30281,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -30384,7 +30292,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31513,16 +31421,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -31534,7 +31432,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31560,16 +31458,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -31581,7 +31469,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -33685,16 +33573,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -33706,7 +33584,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -34806,16 +34684,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -34827,7 +34695,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -34927,16 +34795,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -34948,7 +34806,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -35021,16 +34879,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -35042,7 +34890,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -35159,16 +35007,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -35180,7 +35018,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -37830,16 +37668,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -37851,7 +37679,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -38110,16 +37938,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -38131,7 +37949,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -38186,16 +38004,6 @@
 ALTER TEXT SEARCH CONFIGURATION testcfg OWNER TO buildfarm;
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -38207,7 +38015,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -38283,9 +38091,9 @@
 --
 
 COPY 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'
 \.
 
@@ -38834,16 +38642,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -38855,7 +38653,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -38895,16 +38693,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -38916,7 +38704,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -38942,16 +38730,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -38963,7 +38741,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39734,7 +39512,9 @@
 --
 
 CREATE VIEW trigger_test_view AS
-SELECT trigger_test.i, trigger_test.v FROM trigger_test;
+ SELECT trigger_test.i,
+    trigger_test.v
+   FROM trigger_test;
 
 
 ALTER TABLE trigger_test_view OWNER TO buildfarm;
@@ -39844,16 +39624,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -39865,7 +39635,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39898,16 +39668,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
@@ -39919,7 +39679,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -44850,7 +44610,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)))
 );
 
 
@@ -44993,7 +44753,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)))
 );
 
 
@@ -45208,7 +44968,8 @@
 --
 
 CREATE VIEW domview AS
-SELECT (domtab.col1)::dom AS col1 FROM domtab;
+ SELECT (domtab.col1)::dom AS col1
+   FROM domtab;
 
 
 ALTER TABLE domview OWNER TO buildfarm;
@@ -45495,7 +45256,12 @@
 --
 
 CREATE VIEW iexit AS
-SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE (ih.thepath ## r.thepath);
+ SELECT ih.name,
+    ih.thepath,
+    interpt_pp(ih.thepath, r.thepath) AS exit
+   FROM ihighway ih,
+    ramp r
+  WHERE (ih.thepath ## r.thepath);
 
 
 ALTER TABLE iexit OWNER TO buildfarm;
@@ -45570,8 +45336,8 @@
 CREATE TABLE insert_tbl (
     x integer DEFAULT nextval('insert_seq'::regclass),
     y text DEFAULT '-NULL-'::text,
-    z integer DEFAULT ((-1) * currval('insert_seq'::regclass)),
-    CONSTRAINT insert_con CHECK ((((x >= 3) AND (y <> 'check failed'::text)) AND (x < 8))),
+    z integer DEFAULT ('-1'::integer * currval('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))
 );
 
@@ -45709,7 +45475,15 @@
 --
 
 CREATE VIEW my_credit_card_normal AS
-SELECT l.cid, l.name, l.tel, l.passwd, r.cnum, r.climit FROM (customer l NATURAL JOIN credit_card r) WHERE (l.name = ("current_user"())::text);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    r.cnum,
+    r.climit
+   FROM (customer l
+     JOIN credit_card r USING (cid))
+  WHERE (l.name = ("current_user"())::text);
 
 
 ALTER TABLE my_credit_card_normal OWNER TO buildfarm;
@@ -45719,7 +45493,15 @@
 --
 
 CREATE VIEW my_credit_card_secure WITH (security_barrier='true') AS
-SELECT l.cid, l.name, l.tel, l.passwd, r.cnum, r.climit FROM (customer l NATURAL JOIN credit_card r) WHERE (l.name = ("current_user"())::text);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    r.cnum,
+    r.climit
+   FROM (customer l
+     JOIN credit_card r USING (cid))
+  WHERE (l.name = ("current_user"())::text);
 
 
 ALTER TABLE my_credit_card_secure OWNER TO buildfarm;
@@ -45729,7 +45511,16 @@
 --
 
 CREATE VIEW my_credit_card_usage_normal AS
-SELECT l.cid, l.name, l.tel, l.passwd, l.cnum, l.climit, r.ymd, r.usage FROM (my_credit_card_secure l NATURAL JOIN credit_usage r);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    l.cnum,
+    l.climit,
+    r.ymd,
+    r.usage
+   FROM (my_credit_card_secure l
+     JOIN credit_usage r USING (cid));
 
 
 ALTER TABLE my_credit_card_usage_normal OWNER TO buildfarm;
@@ -45739,7 +45530,16 @@
 --
 
 CREATE VIEW 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 (my_credit_card_secure l NATURAL JOIN credit_usage r);
+ SELECT l.cid,
+    l.name,
+    l.tel,
+    l.passwd,
+    l.cnum,
+    l.climit,
+    r.ymd,
+    r.usage
+   FROM (my_credit_card_secure l
+     JOIN credit_usage r USING (cid));
 
 
 ALTER TABLE my_credit_card_usage_secure OWNER TO buildfarm;
@@ -45749,7 +45549,12 @@
 --
 
 CREATE VIEW my_property_normal WITH (security_barrier='true') AS
-SELECT customer.cid, customer.name, customer.tel, customer.passwd FROM customer WHERE (customer.name = ("current_user"())::text);
+ SELECT customer.cid,
+    customer.name,
+    customer.tel,
+    customer.passwd
+   FROM customer
+  WHERE (customer.name = ("current_user"())::text);
 
 
 ALTER TABLE my_property_normal OWNER TO buildfarm;
@@ -45759,7 +45564,12 @@
 --
 
 CREATE VIEW my_property_secure WITH (security_barrier='false') AS
-SELECT customer.cid, customer.name, customer.tel, customer.passwd FROM customer WHERE (customer.name = ("current_user"())::text);
+ SELECT customer.cid,
+    customer.name,
+    customer.tel,
+    customer.passwd
+   FROM customer
+  WHERE (customer.name = ("current_user"())::text);
 
 
 ALTER TABLE my_property_secure OWNER TO buildfarm;
@@ -46052,7 +45862,11 @@
 --
 
 CREATE VIEW pfield_v1 AS
-SELECT pf.pfname, pf.slotname, pslot_backlink_view(pf.slotname) AS backside, pslot_slotlink_view(pf.slotname) AS patch FROM pslot pf;
+ SELECT pf.pfname,
+    pf.slotname,
+    pslot_backlink_view(pf.slotname) AS backside,
+    pslot_slotlink_view(pf.slotname) AS patch
+   FROM pslot pf;
 
 
 ALTER TABLE pfield_v1 OWNER TO buildfarm;
@@ -46534,7 +46348,9 @@
 --
 
 CREATE VIEW rtest_v1 AS
-SELECT rtest_t1.a, rtest_t1.b FROM rtest_t1;
+ SELECT rtest_t1.a,
+    rtest_t1.b
+   FROM rtest_t1;
 
 
 ALTER TABLE rtest_v1 OWNER TO buildfarm;
@@ -46544,7 +46360,11 @@
 --
 
 CREATE VIEW rtest_vcomp AS
-SELECT x.part, (x.size * y.factor) AS size_in_cm FROM rtest_comp x, rtest_unitfact y WHERE (x.unit = y.unit);
+ SELECT x.part,
+    (x.size * y.factor) AS size_in_cm
+   FROM rtest_comp x,
+    rtest_unitfact y
+  WHERE (x.unit = y.unit);
 
 
 ALTER TABLE rtest_vcomp OWNER TO buildfarm;
@@ -46603,7 +46423,12 @@
 --
 
 CREATE VIEW rtest_vview1 AS
-SELECT x.a, x.b FROM rtest_view1 x WHERE (0 < (SELECT count(*) AS count FROM rtest_view2 y WHERE (y.a = x.a)));
+ SELECT x.a,
+    x.b
+   FROM rtest_view1 x
+  WHERE (0 < ( SELECT count(*) AS count
+           FROM rtest_view2 y
+          WHERE (y.a = x.a)));
 
 
 ALTER TABLE rtest_vview1 OWNER TO buildfarm;
@@ -46613,7 +46438,10 @@
 --
 
 CREATE VIEW rtest_vview2 AS
-SELECT rtest_view1.a, rtest_view1.b FROM rtest_view1 WHERE rtest_view1.v;
+ SELECT rtest_view1.a,
+    rtest_view1.b
+   FROM rtest_view1
+  WHERE rtest_view1.v;
 
 
 ALTER TABLE rtest_vview2 OWNER TO buildfarm;
@@ -46623,7 +46451,12 @@
 --
 
 CREATE VIEW rtest_vview3 AS
-SELECT x.a, x.b FROM rtest_vview2 x WHERE (0 < (SELECT count(*) AS count FROM rtest_view2 y WHERE (y.a = x.a)));
+ SELECT x.a,
+    x.b
+   FROM rtest_vview2 x
+  WHERE (0 < ( SELECT count(*) AS count
+           FROM rtest_view2 y
+          WHERE (y.a = x.a)));
 
 
 ALTER TABLE rtest_vview3 OWNER TO buildfarm;
@@ -46633,7 +46466,13 @@
 --
 
 CREATE VIEW rtest_vview4 AS
-SELECT x.a, x.b, count(y.a) AS refcount FROM rtest_view1 x, 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 rtest_view1 x,
+    rtest_view2 y
+  WHERE (x.a = y.a)
+  GROUP BY x.a, x.b;
 
 
 ALTER TABLE rtest_vview4 OWNER TO buildfarm;
@@ -46643,7 +46482,10 @@
 --
 
 CREATE VIEW rtest_vview5 AS
-SELECT rtest_view1.a, rtest_view1.b, rtest_viewfunc1(rtest_view1.a) AS refcount FROM rtest_view1;
+ SELECT rtest_view1.a,
+    rtest_view1.b,
+    rtest_viewfunc1(rtest_view1.a) AS refcount
+   FROM rtest_view1;
 
 
 ALTER TABLE rtest_vview5 OWNER TO buildfarm;
@@ -46770,7 +46612,17 @@
 --
 
 CREATE VIEW 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 shoe_data sh, 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 shoe_data sh,
+    unit un
+  WHERE (sh.slunit = un.un_name);
 
 
 ALTER TABLE shoe OWNER TO buildfarm;
@@ -46795,7 +46647,15 @@
 --
 
 CREATE VIEW 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 shoelace_data s, 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 shoelace_data s,
+    unit u
+  WHERE (s.sl_unit = u.un_name);
 
 
 ALTER TABLE shoelace OWNER TO buildfarm;
@@ -46805,7 +46665,14 @@
 --
 
 CREATE VIEW 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 shoe rsh, 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 shoe rsh,
+    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 shoe_ready OWNER TO buildfarm;
@@ -46827,7 +46694,16 @@
 --
 
 CREATE VIEW shoelace_obsolete AS
-SELECT shoelace.sl_name, shoelace.sl_avail, shoelace.sl_color, shoelace.sl_len, shoelace.sl_unit, shoelace.sl_len_cm FROM shoelace WHERE (NOT (EXISTS (SELECT shoe.shoename FROM 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 shoelace
+  WHERE (NOT (EXISTS ( SELECT shoe.shoename
+           FROM shoe
+          WHERE (shoe.slcolor = shoelace.sl_color))));
 
 
 ALTER TABLE shoelace_obsolete OWNER TO buildfarm;
@@ -46837,7 +46713,14 @@
 --
 
 CREATE VIEW 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 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 shoelace_obsolete
+  WHERE (shoelace_obsolete.sl_avail = 0);
 
 
 ALTER TABLE shoelace_candelete OWNER TO buildfarm;
@@ -46884,7 +46767,12 @@
 --
 
 CREATE VIEW street AS
-SELECT r.name, r.thepath, c.cname FROM ONLY road r, real_city c WHERE (c.outline ## r.thepath);
+ SELECT r.name,
+    r.thepath,
+    c.cname
+   FROM ONLY road r,
+    real_city c
+  WHERE (c.outline ## r.thepath);
 
 
 ALTER TABLE street OWNER TO buildfarm;
@@ -47237,7 +47125,11 @@
 --
 
 CREATE VIEW toyemp AS
-SELECT emp.name, emp.age, emp.location, (12 * emp.salary) AS annualsal FROM emp;
+ SELECT emp.name,
+    emp.age,
+    emp.location,
+    (12 * emp.salary) AS annualsal
+   FROM emp;
 
 
 ALTER TABLE toyemp OWNER TO buildfarm;
@@ -47394,7 +47286,7 @@
 --
 
 CREATE VIEW xmlview1 AS
-SELECT xmlcomment('test'::text) AS xmlcomment;
+ SELECT xmlcomment('test'::text) AS xmlcomment;
 
 
 ALTER TABLE xmlview1 OWNER TO buildfarm;
@@ -47404,7 +47296,7 @@
 --
 
 CREATE VIEW xmlview2 AS
-SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
+ SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
 
 
 ALTER TABLE xmlview2 OWNER TO buildfarm;
@@ -47414,7 +47306,7 @@
 --
 
 CREATE VIEW 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 xmlview3 OWNER TO buildfarm;
@@ -47424,7 +47316,8 @@
 --
 
 CREATE VIEW xmlview4 AS
-SELECT XMLELEMENT(NAME employee, XMLFOREST(emp.name AS name, emp.age AS age, emp.salary AS pay)) AS "xmlelement" FROM emp;
+ SELECT XMLELEMENT(NAME employee, XMLFOREST(emp.name AS name, emp.age AS age, emp.salary AS pay)) AS "xmlelement"
+   FROM emp;
 
 
 ALTER TABLE xmlview4 OWNER TO buildfarm;
@@ -47434,7 +47327,7 @@
 --
 
 CREATE VIEW 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 xmlview5 OWNER TO buildfarm;
@@ -47444,7 +47337,7 @@
 --
 
 CREATE VIEW xmlview6 AS
-SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";
+ SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";
 
 
 ALTER TABLE xmlview6 OWNER TO buildfarm;
@@ -47454,7 +47347,7 @@
 --
 
 CREATE VIEW 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 xmlview7 OWNER TO buildfarm;
@@ -47464,7 +47357,7 @@
 --
 
 CREATE VIEW 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 xmlview8 OWNER TO buildfarm;
@@ -47474,7 +47367,7 @@
 --
 
 CREATE VIEW xmlview9 AS
-SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";
+ SELECT XMLSERIALIZE(CONTENT 'good'::xml AS text) AS "xmlserialize";
 
 
 ALTER TABLE xmlview9 OWNER TO buildfarm;
@@ -210684,9 +210577,9 @@
 --
 
 COPY 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'
 \.
 
@@ -212216,203 +212109,277 @@
 -- Name: shoelace_data log_shoelace; Type: RULE; Schema: public; Owner: buildfarm
 --
 
-CREATE RULE log_shoelace AS ON UPDATE TO shoelace_data WHERE (new.sl_avail <> old.sl_avail) DO INSERT INTO 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 shoelace_data
+   WHERE (new.sl_avail <> old.sl_avail) DO  INSERT INTO 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 ruletest_tbl DO INSTEAD INSERT INTO ruletest_tbl2 (a, b) VALUES (1000, 1000);
+CREATE RULE myrule AS
+    ON INSERT TO ruletest_tbl DO INSTEAD  INSERT INTO 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 rtest_emp DO INSERT INTO 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 rtest_emp DO  INSERT INTO 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 rtest_emp DO INSERT INTO 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 rtest_emp DO  INSERT INTO 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 rtest_emp WHERE (new.salary <> old.salary) DO INSERT INTO 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 rtest_emp
+   WHERE (new.salary <> old.salary) DO  INSERT INTO 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 rtest_nothn1 WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
+CREATE RULE rtest_nothn_r1 AS
+    ON INSERT TO 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 rtest_nothn1 WHERE ((new.a >= 30) AND (new.a < 40)) DO INSTEAD NOTHING;
+CREATE RULE rtest_nothn_r2 AS
+    ON INSERT TO 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 rtest_nothn2 WHERE (new.a >= 100) DO INSTEAD INSERT INTO rtest_nothn3 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_nothn_r3 AS
+    ON INSERT TO rtest_nothn2
+   WHERE (new.a >= 100) DO INSTEAD  INSERT INTO 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 rtest_nothn2 DO INSTEAD NOTHING;
+CREATE RULE rtest_nothn_r4 AS
+    ON INSERT TO 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 rtest_order1 DO INSTEAD INSERT INTO rtest_order2 (a, b, c) VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 1 - this should run 1st'::text);
+CREATE RULE rtest_order_r1 AS
+    ON INSERT TO rtest_order1 DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('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 rtest_order1 DO INSERT INTO rtest_order2 (a, b, c) VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 2 - this should run 2nd'::text);
+CREATE RULE rtest_order_r2 AS
+    ON INSERT TO rtest_order1 DO  INSERT INTO rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('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 rtest_order1 DO INSTEAD INSERT INTO rtest_order2 (a, b, c) VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 3 - this should run 3rd'::text);
+CREATE RULE rtest_order_r3 AS
+    ON INSERT TO rtest_order1 DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('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 rtest_order1 WHERE (new.a < 100) DO INSTEAD INSERT INTO rtest_order2 (a, b, c) VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 4 - this should run 4th'::text);
+CREATE RULE rtest_order_r4 AS
+    ON INSERT TO rtest_order1
+   WHERE (new.a < 100) DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
+  VALUES (new.a, nextval('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 rtest_person DO DELETE FROM rtest_admin WHERE (rtest_admin.pname = old.pname);
+CREATE RULE rtest_pers_del AS
+    ON DELETE TO rtest_person DO  DELETE FROM 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 rtest_person DO UPDATE rtest_admin SET pname = new.pname WHERE (rtest_admin.pname = old.pname);
+CREATE RULE rtest_pers_upd AS
+    ON UPDATE TO rtest_person DO  UPDATE 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 rtest_system DO (DELETE FROM rtest_interface WHERE (rtest_interface.sysname = old.sysname); DELETE FROM rtest_admin WHERE (rtest_admin.sysname = old.sysname); );
+CREATE RULE rtest_sys_del AS
+    ON DELETE TO rtest_system DO ( DELETE FROM rtest_interface
+  WHERE (rtest_interface.sysname = old.sysname);
+ DELETE FROM 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 rtest_system DO (UPDATE rtest_interface SET sysname = new.sysname WHERE (rtest_interface.sysname = old.sysname); UPDATE rtest_admin SET sysname = new.sysname WHERE (rtest_admin.sysname = old.sysname); );
+CREATE RULE rtest_sys_upd AS
+    ON UPDATE TO rtest_system DO ( UPDATE rtest_interface SET sysname = new.sysname
+  WHERE (rtest_interface.sysname = old.sysname);
+ UPDATE 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 rtest_t4 WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD INSERT INTO rtest_t5 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t4_ins1 AS
+    ON INSERT TO rtest_t4
+   WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD  INSERT INTO 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 rtest_t4 WHERE ((new.a >= 20) AND (new.a < 30)) DO INSERT INTO rtest_t6 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t4_ins2 AS
+    ON INSERT TO rtest_t4
+   WHERE ((new.a >= 20) AND (new.a < 30)) DO  INSERT INTO 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 rtest_t5 WHERE (new.a > 15) DO INSERT INTO rtest_t7 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t5_ins AS
+    ON INSERT TO rtest_t5
+   WHERE (new.a > 15) DO  INSERT INTO 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 rtest_t6 WHERE (new.a > 25) DO INSTEAD INSERT INTO rtest_t8 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_t6_ins AS
+    ON INSERT TO rtest_t6
+   WHERE (new.a > 25) DO INSTEAD  INSERT INTO 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 rtest_v1 DO INSTEAD DELETE FROM rtest_t1 WHERE (rtest_t1.a = old.a);
+CREATE RULE rtest_v1_del AS
+    ON DELETE TO rtest_v1 DO INSTEAD  DELETE FROM 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 rtest_v1 DO INSTEAD INSERT INTO rtest_t1 (a, b) VALUES (new.a, new.b);
+CREATE RULE rtest_v1_ins AS
+    ON INSERT TO rtest_v1 DO INSTEAD  INSERT INTO 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 rtest_v1 DO INSTEAD UPDATE rtest_t1 SET a = new.a, b = new.b WHERE (rtest_t1.a = old.a);
+CREATE RULE rtest_v1_upd AS
+    ON UPDATE TO rtest_v1 DO INSTEAD  UPDATE 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 rule_and_refint_t3 WHERE (EXISTS (SELECT 1 FROM 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 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 rule_and_refint_t3
+   WHERE (EXISTS ( SELECT 1
+           FROM 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 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 shoelace DO INSTEAD DELETE FROM shoelace_data WHERE (shoelace_data.sl_name = old.sl_name);
+CREATE RULE shoelace_del AS
+    ON DELETE TO shoelace DO INSTEAD  DELETE FROM 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 shoelace DO INSTEAD INSERT INTO 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 shoelace DO INSTEAD  INSERT INTO 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 shoelace_ok DO INSTEAD UPDATE 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 shoelace_ok DO INSTEAD  UPDATE 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 shoelace DO INSTEAD UPDATE 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 shoelace DO INSTEAD  UPDATE 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);
 
 
 --
@@ -212778,22 +212745,9 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- Name: my_credit_card_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_normal FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_normal FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_normal TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_normal TO PUBLIC;
 
 
@@ -212801,9 +212755,6 @@
 -- Name: my_credit_card_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_secure FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_secure FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_secure TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_secure TO PUBLIC;
 
 
@@ -212811,9 +212762,6 @@
 -- Name: my_credit_card_usage_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_usage_normal FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_usage_normal FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_usage_normal TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_usage_normal TO PUBLIC;
 
 
@@ -212821,9 +212769,6 @@
 -- Name: my_credit_card_usage_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_credit_card_usage_secure FROM PUBLIC;
-REVOKE ALL ON TABLE my_credit_card_usage_secure FROM buildfarm;
-GRANT ALL ON TABLE my_credit_card_usage_secure TO buildfarm;
 GRANT SELECT ON TABLE my_credit_card_usage_secure TO PUBLIC;
 
 
@@ -212831,9 +212776,6 @@
 -- Name: my_property_normal; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_property_normal FROM PUBLIC;
-REVOKE ALL ON TABLE my_property_normal FROM buildfarm;
-GRANT ALL ON TABLE my_property_normal TO buildfarm;
 GRANT SELECT ON TABLE my_property_normal TO PUBLIC;
 
 
@@ -212841,9 +212783,6 @@
 -- Name: my_property_secure; Type: ACL; Schema: public; Owner: buildfarm
 --
 
-REVOKE ALL ON TABLE my_property_secure FROM PUBLIC;
-REVOKE ALL ON TABLE my_property_secure FROM buildfarm;
-GRANT ALL ON TABLE my_property_secure TO buildfarm;
 GRANT SELECT ON TABLE my_property_secure TO PUBLIC;
 
 
@@ -212859,7 +212798,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.2.16
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -212892,16 +212831,6 @@
 
 
 --
--- Name: 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;
-GRANT ALL ON SCHEMA public TO PUBLIC;
-
-
---
 -- PostgreSQL database dump complete
 --
 
