From 6af2465eb09888b1548b9ba22a2908cdbc04aac3 Mon Sep 17 00:00:00 2001
From: Corey Huinker <corey.huinker@moat.com>
Date: Sun, 19 Mar 2017 17:44:07 -0400
Subject: [PATCH 2/3] remove

---
 src/test/regress/expected/psql-on-error-stop.out | 506 -----------------------
 1 file changed, 506 deletions(-)
 delete mode 100644 src/test/regress/expected/psql-on-error-stop.out

diff --git a/src/test/regress/expected/psql-on-error-stop.out b/src/test/regress/expected/psql-on-error-stop.out
deleted file mode 100644
index c812e97..0000000
--- a/src/test/regress/expected/psql-on-error-stop.out
+++ /dev/null
@@ -1,506 +0,0 @@
---
--- Tests for psql features that aren't closely connected to any
--- specific server features
---
-
--- \set
-
--- fail: invalid name
-\set invalid/name foo
--- fail: invalid value for special variable
-\set AUTOCOMMIT foo
-\set FETCH_COUNT foo
--- check handling of built-in boolean variable
-\echo :ON_ERROR_ROLLBACK
-\set ON_ERROR_ROLLBACK
-\echo :ON_ERROR_ROLLBACK
-\set ON_ERROR_ROLLBACK foo
-\echo :ON_ERROR_ROLLBACK
-\set ON_ERROR_ROLLBACK on
-\echo :ON_ERROR_ROLLBACK
-\unset ON_ERROR_ROLLBACK
-\echo :ON_ERROR_ROLLBACK
-
--- \g and \gx
-
-SELECT 1 as one, 2 as two \g
-\gx
-SELECT 3 as three, 4 as four \gx
-\g
-
--- \gset
-
-select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
-
-\echo :pref01_test01 :pref01_test02 :pref01_test03
-
--- should fail: bad variable name
-select 10 as "bad name"
-\gset
-
--- multiple backslash commands in one line
-select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
-select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
-select 5 as x, 6 as y \gset pref01_ \\ \g \echo :pref01_x :pref01_y
-select 7 as x, 8 as y \g \gset pref01_ \echo :pref01_x :pref01_y
-
--- NULL should unset the variable
-\set var2 xyz
-select 1 as var1, NULL as var2, 3 as var3 \gset
-\echo :var1 :var2 :var3
-
--- \gset requires just one tuple
-select 10 as test01, 20 as test02 from generate_series(1,3) \gset
-select 10 as test01, 20 as test02 from generate_series(1,0) \gset
-
--- \gset should work in FETCH_COUNT mode too
-\set FETCH_COUNT 1
-
-select 1 as x, 2 as y \gset pref01_ \\ \echo :pref01_x
-select 3 as x, 4 as y \gset pref01_ \echo :pref01_x \echo :pref01_y
-select 10 as test01, 20 as test02 from generate_series(1,3) \gset
-select 10 as test01, 20 as test02 from generate_series(1,0) \gset
-
-\unset FETCH_COUNT
-
--- \gexec
-
-create temporary table gexec_test(a int, b text, c date, d float);
-select format('create index on gexec_test(%I)', attname)
-from pg_attribute
-where attrelid = 'gexec_test'::regclass and attnum > 0
-order by attnum
-\gexec
-
--- \gexec should work in FETCH_COUNT mode too
--- (though the fetch limit applies to the executed queries not the meta query)
-\set FETCH_COUNT 1
-
-select 'select 1 as ones', 'select x.y, x.y*2 as double from generate_series(1,4) as x(y)'
-union all
-select 'drop table gexec_test', NULL
-union all
-select 'drop table gexec_test', 'select ''2000-01-01''::date as party_over'
-\gexec
-
-\unset FETCH_COUNT
-
--- show all pset options
-\pset
-
--- test multi-line headers, wrapping, and newline indicators
-prepare q as select array_to_string(array_agg(repeat('x',2*n)),E'\n') as "ab
-
-c", array_to_string(array_agg(repeat('y',20-2*n)),E'\n') as "a
-bc" from generate_series(1,10) as n(n) group by n>1 order by n>1;
-
-\pset linestyle ascii
-
-\pset expanded off
-\pset columns 40
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset expanded on
-\pset columns 20
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset linestyle old-ascii
-
-\pset expanded off
-\pset columns 40
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset expanded on
-\pset columns 20
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-deallocate q;
-
--- test single-line header and data
-prepare q as select repeat('x',2*n) as "0123456789abcdef", repeat('y',20-2*n) as "0123456789" from generate_series(1,10) as n;
-
-\pset linestyle ascii
-
-\pset expanded off
-\pset columns 40
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset expanded on
-\pset columns 30
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset expanded on
-\pset columns 20
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset linestyle old-ascii
-
-\pset expanded off
-\pset columns 40
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset expanded on
-
-\pset border 0
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 1
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-\pset border 2
-\pset format unaligned
-execute q;
-\pset format aligned
-execute q;
-\pset format wrapped
-execute q;
-
-deallocate q;
-
-\pset linestyle ascii
-
-prepare q as select ' | = | lkjsafi\\/ /oeu rio)(!@&*#)*(!&@*) \ (&' as " | -- | 012345678 9abc def!*@#&!@(*&*~~_+-=\ \", '11' as "0123456789", 11 as int from generate_series(1,10) as n;
-
-\pset format asciidoc
-\pset expanded off
-\pset border 0
-execute q;
-
-\pset border 1
-execute q;
-
-\pset border 2
-execute q;
-
-\pset expanded on
-\pset border 0
-execute q;
-
-\pset border 1
-execute q;
-
-\pset border 2
-execute q;
-
-deallocate q;
-
-\pset format aligned
-\pset expanded off
-\pset border 1
-
--- test a large nested if using a variety of true-equivalents
-\if true
-	\if 1
-		\if yes
-			\if on
-				\echo 'all true'
-			\else
-				\echo 'should not print #1-1'
-			\endif
-		\else
-			\echo 'should not print #1-2'
-		\endif
-	\else
-		\echo 'should not print #1-3'
-	\endif
-\else
-	\echo 'should not print #1-4'
-\endif
-
--- test a variety of false-equivalents in an if/elif/else structure
-\if false
-	\echo 'should not print #2-1'
-\elif 0
-	\echo 'should not print #2-2'
-\elif no
-	\echo 'should not print #2-3'
-\elif off
-	\echo 'should not print #2-4'
-\else
-	\echo 'all false'
-\endif
-
--- test simple true-then-else
-\if true
-	\echo 'first thing true'
-\else
-	\echo 'should not print #3-1'
-\endif
-
--- test simple false-true-else
-\if false
-	\echo 'should not print #4-1'
-\elif true
-	\echo 'second thing true'
-\else
-	\echo 'should not print #5-1'
-\endif
-
--- invalid boolean expressions are false
-\if invalid_boolean_expression
-	\echo 'will not print #6-1'
-\else
-	\echo 'will print anyway #6-2'
-\endif
-
--- test un-matched endif
-\endif
-
--- test un-matched else
-\else
-
--- test un-matched elif
-\elif
-
--- test double-else error
-\if true
-\else
-\else
-\endif
-
--- test elif out-of-order
-\if false
-\else
-\elif
-\endif
-
--- test if-endif matching in a false branch
-\if false
-    \if false
-        \echo 'should not print #7-1'
-    \else
-        \echo 'should not print #7-2'
-    \endif
-    \echo 'should not print #7-3'
-\else
-    \echo 'should print #7-4'
-\endif
-
--- show that variables still expand even in false blocks
-\set var 'ab''cd'
--- select :var;
-\if false
-  select :var;
--- this will be skipped because of an unterminated string
-\endif
--- fix the unterminated string
-';
--- now the if block can be properly ended
-\endif
-
--- SHOW_CONTEXT
-
-\set SHOW_CONTEXT never
-do $$
-begin
-  raise notice 'foo';
-  raise exception 'bar';
-end $$;
-
-\set SHOW_CONTEXT errors
-do $$
-begin
-  raise notice 'foo';
-  raise exception 'bar';
-end $$;
-
-\set SHOW_CONTEXT always
-do $$
-begin
-  raise notice 'foo';
-  raise exception 'bar';
-end $$;
-- 
2.7.4

