--- /home/bf/bfr/root/upgrade/HEAD/origin-REL9_3_STABLE.sql	2016-05-03 11:53:10.276568890 -0400
+++ /home/bf/bfr/root/upgrade/HEAD/converted-REL9_3_STABLE-to-HEAD.sql	2016-05-03 11:54:26.040566886 -0400
@@ -170,8 +170,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';
@@ -179,8 +177,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;
 
@@ -193,7 +189,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -1589,16 +1585,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
 --
 
@@ -1610,7 +1596,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -8682,16 +8668,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
 --
 
@@ -8703,7 +8679,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -9485,16 +9461,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
 --
 
@@ -9506,7 +9472,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -27923,16 +27889,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
 --
 
@@ -27944,7 +27900,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -28137,16 +28093,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
 --
 
@@ -28158,7 +28104,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31330,16 +31276,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
 --
 
@@ -31351,7 +31287,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31391,16 +31327,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
 --
 
@@ -31412,7 +31338,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31452,16 +31378,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
 --
 
@@ -31473,7 +31389,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31524,16 +31440,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
 --
 
@@ -31545,7 +31451,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31571,16 +31477,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
 --
 
@@ -31592,7 +31488,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -32743,16 +32639,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
 --
 
@@ -32764,7 +32650,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -32790,16 +32676,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
 --
 
@@ -32811,7 +32687,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -34915,16 +34791,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
 --
 
@@ -34936,7 +34802,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36037,16 +35903,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
 --
 
@@ -36058,7 +35914,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36158,16 +36014,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
 --
 
@@ -36179,7 +36025,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36260,16 +36106,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
 --
 
@@ -36281,7 +36117,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36398,16 +36234,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
 --
 
@@ -36419,7 +36245,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39069,16 +38895,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
 --
 
@@ -39090,7 +38906,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39349,16 +39165,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
 --
 
@@ -39370,7 +39176,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39425,16 +39231,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
 --
 
@@ -39446,7 +39242,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39522,9 +39318,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'
 \.
 
@@ -40073,16 +39869,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
 --
 
@@ -40094,7 +39880,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -40134,16 +39920,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
 --
 
@@ -40155,7 +39931,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -40181,16 +39957,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
 --
 
@@ -40202,7 +39968,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41085,16 +40851,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
 --
 
@@ -41106,7 +40862,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41139,16 +40895,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
 --
 
@@ -41160,7 +40906,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -46344,7 +46090,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)))
 );
 
 
@@ -46487,7 +46233,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)))
 );
 
 
@@ -47083,8 +46829,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))
 );
 
@@ -48461,7 +48207,7 @@
     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));
+  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;
@@ -218744,9 +218490,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'
 \.
 
@@ -220580,8 +220326,8 @@
     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));
+          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));
 
 
 --
@@ -221029,22 +220775,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;
 
 
@@ -221052,9 +220785,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;
 
 
@@ -221062,9 +220792,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;
 
 
@@ -221072,9 +220799,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;
 
 
@@ -221082,9 +220806,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;
 
 
@@ -221092,9 +220813,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;
 
 
@@ -221110,7 +220828,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.3.12
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -221143,16 +220861,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
 --
 
