--- /home/bf/bfr/root/upgrade/HEAD/origin-REL9_4_STABLE.sql	2016-05-03 11:54:37.853566574 -0400
+++ /home/bf/bfr/root/upgrade/HEAD/converted-REL9_4_STABLE-to-HEAD.sql	2016-05-03 11:55:57.316564473 -0400
@@ -182,8 +182,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';
@@ -191,8 +189,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;
 
@@ -205,7 +201,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -1716,16 +1712,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
 --
 
@@ -1737,7 +1723,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -8809,16 +8795,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
 --
 
@@ -8830,7 +8806,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -9612,16 +9588,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
 --
 
@@ -9633,7 +9599,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -28050,16 +28016,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
 --
 
@@ -28071,7 +28027,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -28359,16 +28315,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
 --
 
@@ -28380,7 +28326,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31552,16 +31498,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
 --
 
@@ -31573,7 +31509,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31613,16 +31549,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
 --
 
@@ -31634,7 +31560,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31674,16 +31600,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
 --
 
@@ -31695,7 +31611,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31746,16 +31662,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
 --
 
@@ -31767,7 +31673,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -31793,16 +31699,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
 --
 
@@ -31814,7 +31710,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -32965,16 +32861,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
 --
 
@@ -32986,7 +32872,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -33012,16 +32898,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
 --
 
@@ -33033,7 +32909,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -35137,16 +35013,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
 --
 
@@ -35158,7 +35024,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36259,16 +36125,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
 --
 
@@ -36280,7 +36136,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36380,16 +36236,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
 --
 
@@ -36401,7 +36247,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36482,16 +36328,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
 --
 
@@ -36503,7 +36339,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -36620,16 +36456,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
 --
 
@@ -36641,7 +36467,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39291,16 +39117,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
 --
 
@@ -39312,7 +39128,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39571,16 +39387,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
 --
 
@@ -39592,7 +39398,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39647,16 +39453,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
 --
 
@@ -39668,7 +39464,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39708,16 +39504,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
 --
 
@@ -39729,7 +39515,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -39805,9 +39591,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'
 \.
 
@@ -40356,16 +40142,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
 --
 
@@ -40377,7 +40153,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -40417,16 +40193,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
 --
 
@@ -40438,7 +40204,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -40548,16 +40314,6 @@
 ALTER FUNCTION public.uuid_version_bits(uuid) 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
 --
 
@@ -40569,7 +40325,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -40595,16 +40351,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
 --
 
@@ -40616,7 +40362,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41512,16 +41258,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
 --
 
@@ -41533,7 +41269,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -41566,16 +41302,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
 --
 
@@ -41587,7 +41313,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -47101,7 +46827,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)))
 );
 
 
@@ -47244,7 +46970,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)))
 );
 
 
@@ -47840,8 +47566,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))
 );
 
@@ -49217,7 +48943,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;
@@ -219536,9 +219262,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'
 \.
 
@@ -222424,8 +222150,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));
 
 
 --
@@ -222873,22 +222599,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;
 
 
@@ -222896,9 +222609,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;
 
 
@@ -222906,9 +222616,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;
 
 
@@ -222916,9 +222623,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;
 
 
@@ -222926,9 +222630,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;
 
 
@@ -222936,9 +222637,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;
 
 
@@ -222954,7 +222652,7 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 9.4.7
+-- Dumped from database version 9.6devel
 -- Dumped by pg_dump version 9.6devel
 
 SET statement_timeout = 0;
@@ -222987,16 +222685,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
 --
 
