diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2010-11-23 22:27:50 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2010-11-23 22:34:55 +0200 |
| commit | fc946c39aeacdff7df60c83fca6582985e8546c8 (patch) | |
| tree | 866145f64c09c0673a4aa3d3a2f5647f0b7afc45 /src/test | |
| parent | 44475e782f4674d257b9e5c1a3930218a4b4deea (diff) | |
| download | postgresql-fc946c39aeacdff7df60c83fca6582985e8546c8.tar.gz | |
Remove useless whitespace at end of lines
Diffstat (limited to 'src/test')
139 files changed, 1755 insertions, 1791 deletions
diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile index b009416b8f..bbc6ee1d36 100644 --- a/src/test/examples/Makefile +++ b/src/test/examples/Makefile @@ -18,5 +18,5 @@ PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo all: $(PROGS) -clean: +clean: rm -f $(PROGS) diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile index e4d38646e4..c71dc2dbbf 100644 --- a/src/test/locale/Makefile +++ b/src/test/locale/Makefile @@ -10,7 +10,7 @@ DIRS = de_DE.ISO8859-1 gr_GR.ISO8859-7 koi8-r koi8-to-win1251 all: $(PROGS) -clean: +clean: rm -f $(PROGS) for d in $(DIRS); do \ $(MAKE) -C $$d clean || exit; \ diff --git a/src/test/locale/README b/src/test/locale/README index 86246df95d..980df8005b 100644 --- a/src/test/locale/README +++ b/src/test/locale/README @@ -24,5 +24,5 @@ a Makefile (and other files) similar to koi8-r/*. Actually, the simplest the files. Oleg. ----- +---- Oleg Broytmann http://members.xoom.com/phd2/ phd2@earthling.net diff --git a/src/test/locale/de_DE.ISO8859-1/Makefile b/src/test/locale/de_DE.ISO8859-1/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/de_DE.ISO8859-1/Makefile +++ b/src/test/locale/de_DE.ISO8859-1/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/locale/gr_GR.ISO8859-7/Makefile b/src/test/locale/gr_GR.ISO8859-7/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/gr_GR.ISO8859-7/Makefile +++ b/src/test/locale/gr_GR.ISO8859-7/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/locale/koi8-r/Makefile b/src/test/locale/koi8-r/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/koi8-r/Makefile +++ b/src/test/locale/koi8-r/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/locale/koi8-to-win1251/Makefile b/src/test/locale/koi8-to-win1251/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/koi8-to-win1251/Makefile +++ b/src/test/locale/koi8-to-win1251/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/mb/mbregress.sh b/src/test/mb/mbregress.sh index 1ce45c7e1c..20942e30c2 100644 --- a/src/test/mb/mbregress.sh +++ b/src/test/mb/mbregress.sh @@ -46,7 +46,7 @@ do else EXPECTED="expected/${i}.out" fi - + if [ `diff ${EXPECTED} results/${i}.out | wc -l` -ne 0 ] then ( diff -C3 ${EXPECTED} results/${i}.out; \ diff --git a/src/test/performance/runtests.pl b/src/test/performance/runtests.pl index f4bf2fc2ec..edf45ded2f 100755 --- a/src/test/performance/runtests.pl +++ b/src/test/performance/runtests.pl @@ -15,10 +15,10 @@ $DBNAME = 'perftest'; ); # Tests to run: test' script, test' description, ... -# Test' script is in form +# Test' script is in form # # script_name[.ntm][ T] -# +# # script_name is name of file in ./sqls # .ntm means that script will be used for some initialization # and should not be timed: runtests.pl opens /dev/null as STDERR @@ -26,11 +26,11 @@ $DBNAME = 'perftest'; # Script shouldn't notice either he is running for test or for # initialization purposes. # T means that all queries in this test (initialization ?) are to be -# executed in SINGLE transaction. In this case global variable $XACTBLOCK +# executed in SINGLE transaction. In this case global variable $XACTBLOCK # is not empty string. Otherwise, each query in test is to be executed -# in own transaction ($XACTBLOCK is empty string). In accordance with -# $XACTBLOCK, script is to do DBMS specific preparation before execution -# of queries. (Look at example in sqls/inssimple for MySQL - it gives +# in own transaction ($XACTBLOCK is empty string). In accordance with +# $XACTBLOCK, script is to do DBMS specific preparation before execution +# of queries. (Look at example in sqls/inssimple for MySQL - it gives # an idea of what can be done for features unsupported by an DBMS.) # @perftests = ( @@ -91,9 +91,9 @@ for ($i = 0; $i <= $#perftests; $i++) $runtest = $test; if ( $test =~ /\.ntm/ ) { - # + # # No timing for this queries - # + # close (STDERR); # close $TmpFile open (STDERR, ">/dev/null") or die; $runtest =~ s/\.ntm//; diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 0755304820..2869b4022c 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -162,7 +162,7 @@ runtest: installcheck runtest-parallel: installcheck-parallel bigtest: all tablespace-setup - $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule numeric_big + $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule numeric_big bigcheck: all tablespace-setup $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big diff --git a/src/test/regress/expected/abstime.out b/src/test/regress/expected/abstime.out index a04f091666..ed48f642ab 100644 --- a/src/test/regress/expected/abstime.out +++ b/src/test/regress/expected/abstime.out @@ -5,7 +5,7 @@ -- -- -- timezones may vary based not only on location but the operating --- system. the main correctness issue is that the OS may not get +-- system. the main correctness issue is that the OS may not get -- daylight savings time right for times prior to Unix epoch (jan 1 1970). -- CREATE TABLE ABSTIME_TBL (f1 abstime); @@ -26,7 +26,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'epoch'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime '-infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'May 10, 1947 23:59:12'); --- what happens if we specify slightly misformatted abstime? +-- what happens if we specify slightly misformatted abstime? INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'); ERROR: date/time field value out of range: "Feb 35, 1946 10:00:00" LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'... @@ -36,7 +36,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'); ERROR: date/time field value out of range: "Feb 28, 1984 25:08:10" LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'... ^ --- badly formatted abstimes: these should result in invalid abstimes +-- badly formatted abstimes: these should result in invalid abstimes INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); ERROR: invalid input syntax for type abstime: "bad date format" LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out index ed3b0c4b75..82407bc9fd 100644 --- a/src/test/regress/expected/aggregates.out +++ b/src/test/regress/expected/aggregates.out @@ -317,7 +317,7 @@ CREATE TEMPORARY TABLE bitwise_test( y BIT(4) ); -- empty case -SELECT +SELECT BIT_AND(i2) AS "?", BIT_OR(i4) AS "?" FROM bitwise_test; @@ -386,7 +386,7 @@ SELECT t | t | t | t | t | t | t | t | t (1 row) -CREATE TEMPORARY TABLE bool_test( +CREATE TEMPORARY TABLE bool_test( b1 BOOL, b2 BOOL, b3 BOOL, diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index ab19a8e4fc..d6c5827c68 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -35,8 +35,8 @@ ALTER TABLE tmp ADD COLUMN y float4[]; ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -48,7 +48,7 @@ SELECT * FROM tmp; (1 row) DROP TABLE tmp; --- the wolf bug - schema mods caused inconsistent row descriptors +-- the wolf bug - schema mods caused inconsistent row descriptors CREATE TABLE tmp ( initial int4 ); @@ -80,8 +80,8 @@ ALTER TABLE tmp ADD COLUMN y float4[]; ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -137,7 +137,7 @@ ALTER TABLE tmp_view RENAME TO tmp_view_new; ANALYZE tenk1; set enable_seqscan to off; set enable_bitmapscan to off; --- 5 values, sorted +-- 5 values, sorted SELECT unique1 FROM tenk1 WHERE unique1 < 5; unique1 --------- @@ -1413,7 +1413,7 @@ select * from anothertab; (3 rows) alter table anothertab alter column atcol2 type text - using case when atcol2 is true then 'IT WAS TRUE' + using case when atcol2 is true then 'IT WAS TRUE' when atcol2 is false then 'IT WAS FALSE' else 'IT WAS NULL!' end; select * from anothertab; diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out index eff5f88c24..4d86f454f9 100644 --- a/src/test/regress/expected/arrays.out +++ b/src/test/regress/expected/arrays.out @@ -5,7 +5,7 @@ CREATE TABLE arrtest ( a int2[], b int4[][][], c name[], - d text[][], + d text[][], e float8[], f char(5)[], g varchar(5)[] @@ -21,7 +21,7 @@ INSERT INTO arrtest (f) VALUES ('{"too long"}'); ERROR: value too long for type character(5) INSERT INTO arrtest (a, b[1:2][1:2], c, d, e, f, g) - VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', + VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', '{{"elt1", "elt2"}}', '{"3.4", "6.7"}', '{"abc","abcde"}', '{"abc","abcde"}'); INSERT INTO arrtest (a, b[1:2], c, d[1:2]) @@ -37,7 +37,7 @@ SELECT * FROM arrtest; SELECT arrtest.a[1], arrtest.b[1][1][1], arrtest.c[1], - arrtest.d[1][1], + arrtest.d[1][1], arrtest.e[0] FROM arrtest; a | b | c | d | e @@ -58,7 +58,7 @@ SELECT a[1], b[1][1][1], c[1], d[1][1], e[0] SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][1:2] FROM arrtest; a | b | c | d @@ -86,10 +86,10 @@ SELECT array_dims(a) AS a,array_dims(b) AS b,array_dims(c) AS c | [1:2] | [1:2] (3 rows) --- returns nothing +-- returns nothing SELECT * FROM arrtest - WHERE a[1] < 5 and + WHERE a[1] < 5 and c = '{"foobar"}'::_name; a | b | c | d | e | f | g ---+---+---+---+---+---+--- @@ -115,7 +115,7 @@ SELECT a,b,c FROM arrtest; SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][2:2] FROM arrtest; a | b | c | d @@ -940,11 +940,11 @@ select c2[2].f2 from comptable; drop type _comptype; drop table comptable; drop type comptype; -create or replace function unnest1(anyarray) +create or replace function unnest1(anyarray) returns setof anyelement as $$ select $1[s] from generate_subscripts($1,1) g(s); $$ language sql immutable; -create or replace function unnest2(anyarray) +create or replace function unnest2(anyarray) returns setof anyelement as $$ select $1[s1][s2] from generate_subscripts($1,1) g1(s1), generate_subscripts($1,2) g2(s2); diff --git a/src/test/regress/expected/bit.out b/src/test/regress/expected/bit.out index 40082ca14a..9c7d202149 100644 --- a/src/test/regress/expected/bit.out +++ b/src/test/regress/expected/bit.out @@ -14,7 +14,7 @@ INSERT INTO BIT_TABLE VALUES (B'101011111010'); -- too long ERROR: bit string length 12 does not match type bit(11) --INSERT INTO BIT_TABLE VALUES ('X554'); --INSERT INTO BIT_TABLE VALUES ('X555'); -SELECT * FROM BIT_TABLE; +SELECT * FROM BIT_TABLE; b ------------- 00000000000 @@ -31,7 +31,7 @@ INSERT INTO VARBIT_TABLE VALUES (B'101011111010'); -- too long ERROR: bit string too long for type bit varying(11) --INSERT INTO VARBIT_TABLE VALUES ('X554'); --INSERT INTO VARBIT_TABLE VALUES ('X555'); -SELECT * FROM VARBIT_TABLE; +SELECT * FROM VARBIT_TABLE; v ------------- @@ -42,7 +42,7 @@ SELECT * FROM VARBIT_TABLE; -- Concatenation SELECT v, b, (v || b) AS concat - FROM BIT_TABLE, VARBIT_TABLE + FROM BIT_TABLE, VARBIT_TABLE ORDER BY 3; v | b | concat -------------+-------------+------------------------ @@ -110,7 +110,7 @@ SELECT v, DROP TABLE varbit_table; CREATE TABLE varbit_table (a BIT VARYING(16), b BIT VARYING(16)); COPY varbit_table FROM stdin; -SELECT a, b, ~a AS "~ a", a & b AS "a & b", +SELECT a, b, ~a AS "~ a", a & b AS "a & b", a | b AS "a | b", a # b AS "a # b" FROM varbit_table; a | b | ~ a | a & b | a | b | a # b ------------------+------------------+------------------+------------------+------------------+------------------ @@ -162,7 +162,7 @@ DROP TABLE varbit_table; DROP TABLE bit_table; CREATE TABLE bit_table (a BIT(16), b BIT(16)); COPY bit_table FROM stdin; -SELECT a,b,~a AS "~ a",a & b AS "a & b", +SELECT a,b,~a AS "~ a",a & b AS "a & b", a|b AS "a | b", a # b AS "a # b" FROM bit_table; a | b | ~ a | a & b | a | b | a # b ------------------+------------------+------------------+------------------+------------------+------------------ @@ -455,7 +455,7 @@ INSERT INTO BIT_SHIFT_TABLE SELECT b>>4 FROM BIT_SHIFT_TABLE; INSERT INTO BIT_SHIFT_TABLE SELECT b>>8 FROM BIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN b), POSITION(B'11011' IN b), - b + b FROM BIT_SHIFT_TABLE ; position | position | b ----------+----------+------------------ @@ -485,7 +485,7 @@ INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'0000' AS BIT VARYING(12)) >>4 INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'00000000' AS BIT VARYING(20)) >>8 FROM VARBIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN v), POSITION(B'11011' IN v), - v + v FROM VARBIT_SHIFT_TABLE ; position | position | v ----------+----------+---------------------- diff --git a/src/test/regress/expected/bitmapops.out b/src/test/regress/expected/bitmapops.out index d88a76fe24..3570973e3c 100644 --- a/src/test/regress/expected/bitmapops.out +++ b/src/test/regress/expected/bitmapops.out @@ -9,7 +9,7 @@ -- That allows us to test all the different combinations of -- lossy and non-lossy pages with the minimum amount of data CREATE TABLE bmscantest (a int, b int, t text); -INSERT INTO bmscantest +INSERT INTO bmscantest SELECT (r%53), (r%59), 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo' FROM generate_series(1,70000) r; CREATE INDEX i_bmtest_a ON bmscantest(a); diff --git a/src/test/regress/expected/boolean.out b/src/test/regress/expected/boolean.out index 28d7cf9526..e39f550332 100644 --- a/src/test/regress/expected/boolean.out +++ b/src/test/regress/expected/boolean.out @@ -225,7 +225,7 @@ CREATE TABLE BOOLTBL1 (f1 bool); INSERT INTO BOOLTBL1 (f1) VALUES (bool 't'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'True'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'true'); --- BOOLTBL1 should be full of true's at this point +-- BOOLTBL1 should be full of true's at this point SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1; t_3 | f1 -----+---- @@ -244,7 +244,7 @@ SELECT '' AS t_3, BOOLTBL1.* | t (3 rows) -SELECT '' AS t_3, BOOLTBL1.* +SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 <> bool 'false'; t_3 | f1 @@ -262,7 +262,7 @@ SELECT '' AS zero, BOOLTBL1.* (0 rows) INSERT INTO BOOLTBL1 (f1) VALUES (bool 'f'); -SELECT '' AS f_1, BOOLTBL1.* +SELECT '' AS f_1, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 = bool 'false'; f_1 | f1 @@ -277,12 +277,12 @@ INSERT INTO BOOLTBL2 (f1) VALUES (bool 'False'); INSERT INTO BOOLTBL2 (f1) VALUES (bool 'FALSE'); -- This is now an invalid expression -- For pre-v6.3 this evaluated to false - thomas 1997-10-23 -INSERT INTO BOOLTBL2 (f1) - VALUES (bool 'XXX'); +INSERT INTO BOOLTBL2 (f1) + VALUES (bool 'XXX'); ERROR: invalid input syntax for type boolean: "XXX" LINE 2: VALUES (bool 'XXX'); ^ --- BOOLTBL2 should be full of false's at this point +-- BOOLTBL2 should be full of false's at this point SELECT '' AS f_4, BOOLTBL2.* FROM BOOLTBL2; f_4 | f1 -----+---- diff --git a/src/test/regress/expected/box.out b/src/test/regress/expected/box.out index 2a94e33465..fc3154014b 100644 --- a/src/test/regress/expected/box.out +++ b/src/test/regress/expected/box.out @@ -18,11 +18,11 @@ CREATE TABLE BOX_TBL (f1 box); INSERT INTO BOX_TBL (f1) VALUES ('(2.0,2.0,0.0,0.0)'); INSERT INTO BOX_TBL (f1) VALUES ('(1.0,1.0,3.0,3.0)'); --- degenerate cases where the box is a line or a point --- note that lines and points boxes all have zero area +-- degenerate cases where the box is a line or a point +-- note that lines and points boxes all have zero area INSERT INTO BOX_TBL (f1) VALUES ('(2.5, 2.5, 2.5,3.5)'); INSERT INTO BOX_TBL (f1) VALUES ('(3.0, 3.0,3.0,3.0)'); --- badly formatted box inputs +-- badly formatted box inputs INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); ERROR: invalid input syntax for type box: "(2.3, 4.5)" LINE 1: INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); @@ -50,9 +50,9 @@ SELECT '' AS four, b.*, area(b.f1) as barea | (3,3),(3,3) | 0 (4 rows) --- overlap +-- overlap SELECT '' AS three, b.f1 - FROM BOX_TBL b + FROM BOX_TBL b WHERE b.f1 && box '(2.5,2.5,1.0,1.0)'; three | f1 -------+--------------------- @@ -61,7 +61,7 @@ SELECT '' AS three, b.f1 | (2.5,3.5),(2.5,2.5) (3 rows) --- left-or-overlap (x only) +-- left-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &< box '(2.0,2.0,2.5,2.5)'; @@ -71,7 +71,7 @@ SELECT '' AS two, b1.* | (2.5,3.5),(2.5,2.5) (2 rows) --- right-or-overlap (x only) +-- right-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &> box '(2.0,2.0,2.5,2.5)'; @@ -81,7 +81,7 @@ SELECT '' AS two, b1.* | (3,3),(3,3) (2 rows) --- left of +-- left of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 << box '(3.0,3.0,5.0,5.0)'; @@ -91,7 +91,7 @@ SELECT '' AS two, b.f1 | (2.5,3.5),(2.5,2.5) (2 rows) --- area <= +-- area <= SELECT '' AS four, b.f1 FROM BOX_TBL b WHERE b.f1 <= box '(3.0,3.0,5.0,5.0)'; @@ -103,7 +103,7 @@ SELECT '' AS four, b.f1 | (3,3),(3,3) (4 rows) --- area < +-- area < SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 < box '(3.0,3.0,5.0,5.0)'; @@ -113,7 +113,7 @@ SELECT '' AS two, b.f1 | (3,3),(3,3) (2 rows) --- area = +-- area = SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 = box '(3.0,3.0,5.0,5.0)'; @@ -123,19 +123,19 @@ SELECT '' AS two, b.f1 | (3,3),(1,1) (2 rows) --- area > +-- area > SELECT '' AS two, b.f1 - FROM BOX_TBL b -- zero area - WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; + FROM BOX_TBL b -- zero area + WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; two | f1 -----+------------- | (2,2),(0,0) | (3,3),(1,1) (2 rows) --- area >= +-- area >= SELECT '' AS four, b.f1 - FROM BOX_TBL b -- zero area + FROM BOX_TBL b -- zero area WHERE b.f1 >= box '(3.5,3.0,4.5,3.0)'; four | f1 ------+--------------------- @@ -145,7 +145,7 @@ SELECT '' AS four, b.f1 | (3,3),(3,3) (4 rows) --- right of +-- right of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE box '(3.0,3.0,5.0,5.0)' >> b.f1; @@ -155,7 +155,7 @@ SELECT '' AS two, b.f1 | (2.5,3.5),(2.5,2.5) (2 rows) --- contained in +-- contained in SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE b.f1 <@ box '(0,0,3,3)'; @@ -166,7 +166,7 @@ SELECT '' AS three, b.f1 | (3,3),(3,3) (3 rows) --- contains +-- contains SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE box '(0,0,3,3)' @> b.f1; @@ -177,7 +177,7 @@ SELECT '' AS three, b.f1 | (3,3),(3,3) (3 rows) --- box equality +-- box equality SELECT '' AS one, b.f1 FROM BOX_TBL b WHERE box '(1,1,3,3)' ~= b.f1; @@ -186,7 +186,7 @@ SELECT '' AS one, b.f1 | (3,3),(1,1) (1 row) --- center of box, left unary operator +-- center of box, left unary operator SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL b1; four | p @@ -197,9 +197,9 @@ SELECT '' AS four, @@(b1.f1) AS p | (3,3) (4 rows) --- wholly-contained +-- wholly-contained SELECT '' AS one, b1.*, b2.* - FROM BOX_TBL b1, BOX_TBL b2 + FROM BOX_TBL b1, BOX_TBL b2 WHERE b1.f1 @> b2.f1 and not b1.f1 ~= b2.f1; one | f1 | f1 -----+-------------+------------- diff --git a/src/test/regress/expected/char.out b/src/test/regress/expected/char.out index a0ba3d4a8c..991c7717d4 100644 --- a/src/test/regress/expected/char.out +++ b/src/test/regress/expected/char.out @@ -15,13 +15,13 @@ SELECT char 'c' = char 'c' AS true; CREATE TABLE CHAR_TBL(f1 char); INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/char_1.out b/src/test/regress/expected/char_1.out index 4cc081deae..8eff75afb5 100644 --- a/src/test/regress/expected/char_1.out +++ b/src/test/regress/expected/char_1.out @@ -15,13 +15,13 @@ SELECT char 'c' = char 'c' AS true; CREATE TABLE CHAR_TBL(f1 char); INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/char_2.out b/src/test/regress/expected/char_2.out index 8fe6e07acc..f54736c3e1 100644 --- a/src/test/regress/expected/char_2.out +++ b/src/test/regress/expected/char_2.out @@ -15,13 +15,13 @@ SELECT char 'c' = char 'c' AS true; CREATE TABLE CHAR_TBL(f1 char); INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out index 96bd8164fa..979057d26f 100644 --- a/src/test/regress/expected/cluster.out +++ b/src/test/regress/expected/cluster.out @@ -398,7 +398,7 @@ BEGIN; UPDATE clustertest SET key = 100 WHERE key = 10; -- Test update where the new row version is found first in the scan UPDATE clustertest SET key = 35 WHERE key = 40; --- Test longer update chain +-- Test longer update chain UPDATE clustertest SET key = 60 WHERE key = 50; UPDATE clustertest SET key = 70 WHERE key = 60; UPDATE clustertest SET key = 80 WHERE key = 70; diff --git a/src/test/regress/expected/copyselect.out b/src/test/regress/expected/copyselect.out index 8a42b0e3d8..cbc140c538 100644 --- a/src/test/regress/expected/copyselect.out +++ b/src/test/regress/expected/copyselect.out @@ -113,7 +113,7 @@ ERROR: cannot copy from view "v_test1" HINT: Try the COPY (SELECT ...) TO variant. \copy: ERROR: cannot copy from view "v_test1" HINT: Try the COPY (SELECT ...) TO variant. --- +-- -- Test \copy (select ...) -- \copy (select "id",'id','id""'||t,(id + 1)*id,t,"test1"."t" from test1 where id=3) to stdout diff --git a/src/test/regress/expected/create_aggregate.out b/src/test/regress/expected/create_aggregate.out index 448e319794..ad1459419f 100644 --- a/src/test/regress/expected/create_aggregate.out +++ b/src/test/regress/expected/create_aggregate.out @@ -3,7 +3,7 @@ -- -- all functions CREATEd CREATE AGGREGATE newavg ( - sfunc = int4_avg_accum, basetype = int4, stype = _int8, + sfunc = int4_avg_accum, basetype = int4, stype = _int8, finalfunc = int8_avg, initcond1 = '{0,0}' ); @@ -14,7 +14,7 @@ COMMENT ON AGGREGATE newavg (int4) IS 'an agg comment'; COMMENT ON AGGREGATE newavg (int4) IS NULL; -- without finalfunc; test obsolete spellings 'sfunc1' etc CREATE AGGREGATE newsum ( - sfunc1 = int4pl, basetype = int4, stype1 = int4, + sfunc1 = int4pl, basetype = int4, stype1 = int4, initcond1 = '0' ); -- zero-argument aggregate diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out index 2275343704..27d5e848e5 100644 --- a/src/test/regress/expected/create_index.out +++ b/src/test/regress/expected/create_index.out @@ -54,8 +54,8 @@ CREATE INDEX gcircleind ON circle_tbl USING gist (f1); CREATE INDEX gpointind ON point_tbl USING gist (f1); CREATE TEMP TABLE gpolygon_tbl AS SELECT polygon(home_base) AS f1 FROM slow_emp4000; -INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); -INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); CREATE TEMP TABLE gcircle_tbl AS SELECT circle(home_base) AS f1 FROM slow_emp4000; CREATE INDEX ggpolygonind ON gpolygon_tbl USING gist (f1); @@ -1023,5 +1023,4 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL RESET enable_seqscan; RESET enable_indexscan; RESET enable_bitmapscan; - DROP TABLE onek_with_null; diff --git a/src/test/regress/expected/create_misc.out b/src/test/regress/expected/create_misc.out index 775d1bd1a7..45125fedfd 100644 --- a/src/test/regress/expected/create_misc.out +++ b/src/test/regress/expected/create_misc.out @@ -28,13 +28,13 @@ SELECT * INTO TABLE ramp FROM road WHERE name ~ '.*Ramp'; -INSERT INTO ihighway - SELECT * - FROM road +INSERT INTO ihighway + SELECT * + FROM road WHERE name ~ 'I- .*'; -INSERT INTO shighway - SELECT * - FROM road +INSERT INTO shighway + SELECT * + FROM road WHERE name ~ 'State Hwy.*'; UPDATE shighway SET surface = 'asphalt'; @@ -99,14 +99,14 @@ INSERT INTO f_star (class, a, c, f) INSERT INTO f_star (class, a, e, f) VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); INSERT INTO f_star (class, c, e, f) - VALUES ('f', 'hi keith'::name, '-8'::int2, + VALUES ('f', 'hi keith'::name, '-8'::int2, '(1111,3333),(2222,4444)'::polygon); INSERT INTO f_star (class, a, c) VALUES ('f', 24, 'hi marc'::name); INSERT INTO f_star (class, a, e) VALUES ('f', 25, '-9'::int2); INSERT INTO f_star (class, a, f) - VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); + VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); INSERT INTO f_star (class, c, e) VALUES ('f', 'hi allison'::name, '-10'::int2); INSERT INTO f_star (class, c, f) @@ -117,15 +117,15 @@ INSERT INTO f_star (class, e, f) INSERT INTO f_star (class, a) VALUES ('f', 27); INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name); INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); -INSERT INTO f_star (class, f) +INSERT INTO f_star (class, f) VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); INSERT INTO f_star (class) VALUES ('f'); -- -- for internal portal (cursor) tests -- CREATE TABLE iportaltest ( - i int4, - d float4, + i int4, + d float4, p polygon ); INSERT INTO iportaltest (i, d, p) diff --git a/src/test/regress/expected/create_operator.out b/src/test/regress/expected/create_operator.out index df25f35ae7..8656864655 100644 --- a/src/test/regress/expected/create_operator.out +++ b/src/test/regress/expected/create_operator.out @@ -1,30 +1,30 @@ -- -- CREATE_OPERATOR -- -CREATE OPERATOR ## ( +CREATE OPERATOR ## ( leftarg = path, rightarg = path, procedure = path_inter, - commutator = ## + commutator = ## ); CREATE OPERATOR <% ( leftarg = point, rightarg = widget, procedure = pt_in_widget, commutator = >% , - negator = >=% + negator = >=% ); CREATE OPERATOR @#@ ( - rightarg = int8, -- left unary - procedure = numeric_fac + rightarg = int8, -- left unary + procedure = numeric_fac ); CREATE OPERATOR #@# ( leftarg = int8, -- right unary procedure = numeric_fac ); -CREATE OPERATOR #%# ( - leftarg = int8, -- right unary - procedure = numeric_fac +CREATE OPERATOR #%# ( + leftarg = int8, -- right unary + procedure = numeric_fac ); -- Test comments COMMENT ON OPERATOR ###### (int4, NONE) IS 'bad right unary'; diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 6f65885c82..62010a1482 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -5,7 +5,7 @@ -- CLASS DEFINITIONS -- CREATE TABLE hobbies_r ( - name text, + name text, person text ); CREATE TABLE equipment_r ( @@ -123,7 +123,7 @@ CREATE TABLE real_city ( -- f inherits from e (three-level single inheritance) -- CREATE TABLE a_star ( - class char, + class char, a int4 ); CREATE TABLE b_star ( @@ -165,7 +165,7 @@ CREATE TABLE hash_f8_heap ( ); -- don't include the hash_ovfl_heap stuff in the distribution -- the data set is too large for what it's worth --- +-- -- CREATE TABLE hash_ovfl_heap ( -- x int4, -- y int4 @@ -183,7 +183,7 @@ CREATE TABLE bt_txt_heap ( random int4 ); CREATE TABLE bt_f8_heap ( - seqno float8, + seqno float8, random int4 ); CREATE TABLE array_op_test ( @@ -196,11 +196,11 @@ CREATE TABLE array_index_op_test ( i int4[], t text[] ); -CREATE TABLE IF NOT EXISTS test_tsvector( - t text, - a tsvector +CREATE TABLE IF NOT EXISTS test_tsvector( + t text, + a tsvector ); -CREATE TABLE IF NOT EXISTS test_tsvector( +CREATE TABLE IF NOT EXISTS test_tsvector( t text ); NOTICE: relation "test_tsvector" already exists, skipping diff --git a/src/test/regress/expected/create_type.out b/src/test/regress/expected/create_type.out index 9d3a82e153..6dfe916985 100644 --- a/src/test/regress/expected/create_type.out +++ b/src/test/regress/expected/create_type.out @@ -7,17 +7,17 @@ -- of the "old style" approach of making the functions first. -- CREATE TYPE widget ( - internallength = 24, + internallength = 24, input = widget_in, output = widget_out, typmod_in = numerictypmodin, typmod_out = numerictypmodout, alignment = double ); -CREATE TYPE city_budget ( - internallength = 16, - input = int44in, - output = int44out, +CREATE TYPE city_budget ( + internallength = 16, + input = int44in, + output = int44out, element = int4, category = 'x', -- just to verify the system will take it preferred = true -- ditto diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out index 04383e43d2..f2c06854d0 100644 --- a/src/test/regress/expected/create_view.out +++ b/src/test/regress/expected/create_view.out @@ -4,11 +4,11 @@ -- (this also tests the query rewrite system) -- CREATE VIEW street AS - SELECT r.name, r.thepath, c.cname AS cname + SELECT r.name, r.thepath, c.cname AS cname FROM ONLY road r, real_city c WHERE c.outline ## r.thepath; CREATE VIEW iexit AS - SELECT ih.name, ih.thepath, + SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE ih.thepath ## r.thepath; @@ -58,7 +58,7 @@ ERROR: cannot change name of view column "a" to "?column?" CREATE OR REPLACE VIEW viewtest AS SELECT a, b::numeric FROM viewtest_tbl; ERROR: cannot change data type of view column "b" from integer to numeric --- should work +-- should work CREATE OR REPLACE VIEW viewtest AS SELECT a, b, 0 AS c FROM viewtest_tbl; DROP VIEW viewtest; @@ -133,7 +133,7 @@ CREATE VIEW v9 AS SELECT seq1.is_called FROM seq1; CREATE VIEW v13_temp AS SELECT seq1_temp.is_called FROM seq1_temp; NOTICE: view "v13_temp" will be a temporary view SELECT relname FROM pg_class - WHERE relname LIKE 'v_' + WHERE relname LIKE 'v_' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'temp_view_test') ORDER BY relname; relname @@ -150,7 +150,7 @@ SELECT relname FROM pg_class (9 rows) SELECT relname FROM pg_class - WHERE relname LIKE 'v%' + WHERE relname LIKE 'v%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; relname @@ -199,7 +199,7 @@ SELECT relname FROM pg_class (4 rows) SELECT relname FROM pg_class - WHERE relname LIKE 'temporal%' + WHERE relname LIKE 'temporal%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; relname diff --git a/src/test/regress/expected/drop_if_exists.out b/src/test/regress/expected/drop_if_exists.out index 092c90403a..2a23b4cfe6 100644 --- a/src/test/regress/expected/drop_if_exists.out +++ b/src/test/regress/expected/drop_if_exists.out @@ -1,6 +1,6 @@ --- +-- -- IF EXISTS tests --- +-- -- table (will be really dropped at the end) DROP TABLE test_exists; ERROR: table "test_exists" does not exist diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out index 55822e0b9b..4a10c6ae8a 100644 --- a/src/test/regress/expected/errors.out +++ b/src/test/regress/expected/errors.out @@ -10,19 +10,17 @@ select 1; -- -- UNSUPPORTED STUFF - --- doesn't work +-- doesn't work -- notify pg_class -- -- -- SELECT - --- missing relation name +-- missing relation name select; ERROR: syntax error at or near ";" LINE 1: select; ^ --- no such relation +-- no such relation select * from nonesuch; ERROR: relation "nonesuch" does not exist LINE 1: select * from nonesuch; @@ -59,74 +57,70 @@ LINE 1: select distinct on (foobar) * from pg_database; ^ -- -- DELETE - --- missing relation name (this had better not wildcard!) +-- missing relation name (this had better not wildcard!) delete from; ERROR: syntax error at or near ";" LINE 1: delete from; ^ --- no such relation +-- no such relation delete from nonesuch; ERROR: relation "nonesuch" does not exist LINE 1: delete from nonesuch; ^ -- -- DROP - --- missing relation name (this had better not wildcard!) +-- missing relation name (this had better not wildcard!) drop table; ERROR: syntax error at or near ";" LINE 1: drop table; ^ --- no such relation +-- no such relation drop table nonesuch; ERROR: table "nonesuch" does not exist -- -- ALTER TABLE - --- relation renaming --- missing relation name +-- relation renaming +-- missing relation name alter table rename; ERROR: syntax error at or near ";" LINE 1: alter table rename; ^ --- no such relation +-- no such relation alter table nonesuch rename to newnonesuch; ERROR: relation "nonesuch" does not exist --- no such relation +-- no such relation alter table nonesuch rename to stud_emp; ERROR: relation "nonesuch" does not exist --- conflict +-- conflict alter table stud_emp rename to aggtest; ERROR: relation "aggtest" already exists --- self-conflict +-- self-conflict alter table stud_emp rename to stud_emp; ERROR: relation "stud_emp" already exists --- attribute renaming --- no such relation +-- attribute renaming +-- no such relation alter table nonesuchrel rename column nonesuchatt to newnonesuchatt; ERROR: relation "nonesuchrel" does not exist --- no such attribute +-- no such attribute alter table emp rename column nonesuchatt to newnonesuchatt; ERROR: column "nonesuchatt" does not exist --- conflict +-- conflict alter table emp rename column salary to manager; ERROR: column "manager" of relation "stud_emp" already exists --- conflict +-- conflict alter table emp rename column salary to oid; ERROR: column "oid" of relation "stud_emp" already exists -- -- TRANSACTION STUFF - --- not in a xact +-- not in a xact abort; NOTICE: there is no transaction in progress --- not in a xact +-- not in a xact end; WARNING: there is no transaction in progress -- -- CREATE AGGREGATE --- sfunc/finalfunc type disagreement +-- sfunc/finalfunc type disagreement create aggregate newavg2 (sfunc = int4pl, basetype = int4, stype = int4, @@ -140,24 +134,22 @@ create aggregate newcnt1 (sfunc = int4inc, ERROR: aggregate input type must be specified -- -- DROP INDEX - --- missing index name +-- missing index name drop index; ERROR: syntax error at or near ";" LINE 1: drop index; ^ --- bad index name +-- bad index name drop index 314159; ERROR: syntax error at or near "314159" LINE 1: drop index 314159; ^ --- no such index +-- no such index drop index nonesuch; ERROR: index "nonesuch" does not exist -- -- DROP AGGREGATE - --- missing aggregate name +-- missing aggregate name drop aggregate; ERROR: syntax error at or near ";" LINE 1: drop aggregate; @@ -167,7 +159,7 @@ drop aggregate newcnt1; ERROR: syntax error at or near ";" LINE 1: drop aggregate newcnt1; ^ --- bad aggregate name +-- bad aggregate name drop aggregate 314159 (int); ERROR: syntax error at or near "314159" LINE 1: drop aggregate 314159 (int); @@ -175,7 +167,7 @@ LINE 1: drop aggregate 314159 (int); -- bad aggregate type drop aggregate newcnt (nonesuch); ERROR: type "nonesuch" does not exist --- no such aggregate +-- no such aggregate drop aggregate nonesuch (int4); ERROR: aggregate nonesuch(integer) does not exist -- no such aggregate for type @@ -183,114 +175,110 @@ drop aggregate newcnt (float4); ERROR: aggregate newcnt(real) does not exist -- -- DROP FUNCTION - --- missing function name +-- missing function name drop function (); ERROR: syntax error at or near "(" LINE 1: drop function (); ^ --- bad function name +-- bad function name drop function 314159(); ERROR: syntax error at or near "314159" LINE 1: drop function 314159(); ^ --- no such function +-- no such function drop function nonesuch(); ERROR: function nonesuch() does not exist -- -- DROP TYPE - --- missing type name +-- missing type name drop type; ERROR: syntax error at or near ";" LINE 1: drop type; ^ --- bad type name +-- bad type name drop type 314159; ERROR: syntax error at or near "314159" LINE 1: drop type 314159; ^ --- no such type +-- no such type drop type nonesuch; ERROR: type "nonesuch" does not exist -- -- DROP OPERATOR - --- missing everything +-- missing everything drop operator; ERROR: syntax error at or near ";" LINE 1: drop operator; ^ --- bad operator name +-- bad operator name drop operator equals; ERROR: syntax error at or near ";" LINE 1: drop operator equals; ^ --- missing type list +-- missing type list drop operator ===; ERROR: syntax error at or near ";" LINE 1: drop operator ===; ^ --- missing parentheses +-- missing parentheses drop operator int4, int4; ERROR: syntax error at or near "," LINE 1: drop operator int4, int4; ^ --- missing operator name +-- missing operator name drop operator (int4, int4); ERROR: syntax error at or near "(" LINE 1: drop operator (int4, int4); ^ --- missing type list contents +-- missing type list contents drop operator === (); ERROR: syntax error at or near ")" LINE 1: drop operator === (); ^ --- no such operator +-- no such operator drop operator === (int4); ERROR: missing argument LINE 1: drop operator === (int4); ^ HINT: Use NONE to denote the missing argument of a unary operator. --- no such operator by that name +-- no such operator by that name drop operator === (int4, int4); ERROR: operator does not exist: integer === integer --- no such type1 +-- no such type1 drop operator = (nonesuch); ERROR: missing argument LINE 1: drop operator = (nonesuch); ^ HINT: Use NONE to denote the missing argument of a unary operator. --- no such type1 +-- no such type1 drop operator = ( , int4); ERROR: syntax error at or near "," LINE 1: drop operator = ( , int4); ^ --- no such type1 +-- no such type1 drop operator = (nonesuch, int4); ERROR: type "nonesuch" does not exist --- no such type2 +-- no such type2 drop operator = (int4, nonesuch); ERROR: type "nonesuch" does not exist --- no such type2 +-- no such type2 drop operator = (int4, ); ERROR: syntax error at or near ")" LINE 1: drop operator = (int4, ); ^ -- -- DROP RULE - --- missing rule name +-- missing rule name drop rule; ERROR: syntax error at or near ";" LINE 1: drop rule; ^ --- bad rule name +-- bad rule name drop rule 314159; ERROR: syntax error at or near "314159" LINE 1: drop rule 314159; ^ --- no such rule +-- no such rule drop rule nonesuch on noplace; ERROR: relation "noplace" does not exist -- these postquel variants are no longer supported @@ -360,7 +348,7 @@ VALUES(123); ERROR: syntax error at or near "123" LINE 1: INSERT INTO 123 ^ -INSERT INTO foo +INSERT INTO foo VALUES(123) 123 ; ERROR: syntax error at or near "123" @@ -375,11 +363,11 @@ ERROR: syntax error at or near "NUL" LINE 3: id3 INTEGER NOT NUL, ^ -- long line to be truncated on the left -CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); ERROR: syntax error at or near "NUL" -LINE 1: ...T NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, - ^ +LINE 1: ...OT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, + ^ -- long line to be truncated on the right CREATE TABLE foo( id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY); @@ -394,24 +382,24 @@ LINE 1: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I... -- long line to be truncated on the left, many lines CREATE TEMPORARY -TABLE -foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, -id4 INT4 -UNIQUE -NOT -NULL, -id5 TEXT -UNIQUE -NOT +TABLE +foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +id4 INT4 +UNIQUE +NOT +NULL, +id5 TEXT +UNIQUE +NOT NULL) ; ERROR: syntax error at or near "NUL" -LINE 4: ...T NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, - ^ +LINE 4: ...OT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, + ^ -- long line to be truncated on the right, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo( id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY) ; @@ -419,40 +407,40 @@ ERROR: syntax error at or near "NUL" LINE 5: id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQ... ^ -- long line to be truncated both ways, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, +(id +INT4 +UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, idv INT4 UNIQUE NOT NULL); ERROR: syntax error at or near "NUL" LINE 7: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I... ^ -- more than 10 lines... -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE -NOT +(id +INT4 +UNIQUE +NOT NULL -, +, idm -INT4 -UNIQUE -NOT +INT4 +UNIQUE +NOT NULL, -idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, -idv -INT4 -UNIQUE -NOT +idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, +idv +INT4 +UNIQUE +NOT NULL); ERROR: syntax error at or near "NUL" LINE 16: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I... diff --git a/src/test/regress/expected/float4-exp-three-digits.out b/src/test/regress/expected/float4-exp-three-digits.out index ff680f4792..f17f95697a 100644 --- a/src/test/regress/expected/float4-exp-three-digits.out +++ b/src/test/regress/expected/float4-exp-three-digits.out @@ -7,7 +7,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30 '); INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); --- test for over and under flow +-- test for over and under flow INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); ERROR: value out of range: overflow LINE 1: INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); @@ -233,7 +233,7 @@ SELECT '' AS five, * FROM FLOAT4_TBL; | 1.23457e-020 (5 rows) --- test the unary float4abs operator +-- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; five | f1 | abs_f1 ------+--------------+-------------- diff --git a/src/test/regress/expected/float4.out b/src/test/regress/expected/float4.out index dd8066a79c..fd46a4a1db 100644 --- a/src/test/regress/expected/float4.out +++ b/src/test/regress/expected/float4.out @@ -7,7 +7,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30 '); INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); --- test for over and under flow +-- test for over and under flow INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); ERROR: value out of range: overflow LINE 1: INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); @@ -233,7 +233,7 @@ SELECT '' AS five, * FROM FLOAT4_TBL; | 1.23457e-20 (5 rows) --- test the unary float4abs operator +-- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; five | f1 | abs_f1 ------+-------------+------------- diff --git a/src/test/regress/expected/float8-exp-three-digits-win32.out b/src/test/regress/expected/float8-exp-three-digits-win32.out index a4b8b47bad..2dd648d6b9 100644 --- a/src/test/regress/expected/float8-exp-three-digits-win32.out +++ b/src/test/regress/expected/float8-exp-three-digits-win32.out @@ -184,7 +184,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -231,8 +231,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -243,7 +243,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -255,7 +255,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -310,7 +310,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -340,7 +340,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -351,7 +351,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -409,7 +409,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/float8-small-is-zero.out b/src/test/regress/expected/float8-small-is-zero.out index 6bddbc9290..5da743374c 100644 --- a/src/test/regress/expected/float8-small-is-zero.out +++ b/src/test/regress/expected/float8-small-is-zero.out @@ -188,7 +188,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -235,8 +235,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -247,7 +247,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -259,7 +259,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -314,7 +314,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -344,7 +344,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -355,7 +355,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -413,7 +413,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/float8-small-is-zero_1.out b/src/test/regress/expected/float8-small-is-zero_1.out index f48d280845..530842e102 100644 --- a/src/test/regress/expected/float8-small-is-zero_1.out +++ b/src/test/regress/expected/float8-small-is-zero_1.out @@ -188,7 +188,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -235,8 +235,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -247,7 +247,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -259,7 +259,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -314,7 +314,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -344,7 +344,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -355,7 +355,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -413,7 +413,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out index d8350d100e..6221538af5 100644 --- a/src/test/regress/expected/float8.out +++ b/src/test/regress/expected/float8.out @@ -184,7 +184,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -231,8 +231,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -243,7 +243,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -255,7 +255,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -310,7 +310,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -340,7 +340,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -351,7 +351,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -409,7 +409,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index 0367f53233..87d573b6ab 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -62,7 +62,7 @@ DROP TABLE PKTABLE; -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" -CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL); -- Test comments COMMENT ON CONSTRAINT constrname_wrong ON FKTABLE IS 'fk constraint comment'; @@ -175,7 +175,7 @@ DROP TABLE FKTABLE; -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" -CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT); -- Insert a value in PKTABLE for default INSERT INTO PKTABLE VALUES (-1, -2, 'The Default!'); @@ -351,7 +351,7 @@ INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -416,7 +416,7 @@ INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -513,8 +513,8 @@ INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -618,8 +618,8 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); INSERT INTO PKTABLE VALUES (2, -1, 5, 'test5'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (2, 4, 5, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); @@ -745,7 +745,7 @@ DROP TABLE PKTABLE; -- -- Tests for mismatched types -- --- Basic one column, two table setup +-- Basic one column, two table setup CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" INSERT INTO PKTABLE VALUES(42); @@ -831,7 +831,7 @@ CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY ptest4) REFERENCES pktable(ptest1, ptest2)); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" DROP TABLE PKTABLE; --- And this, +-- And this, CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" diff --git a/src/test/regress/expected/hash_index.out b/src/test/regress/expected/hash_index.out index 432c932480..22835f8ea4 100644 --- a/src/test/regress/expected/hash_index.out +++ b/src/test/regress/expected/hash_index.out @@ -108,10 +108,10 @@ SELECT h.seqno AS i1492, h.random AS i1 1492 | 1 (1 row) -UPDATE hash_i4_heap - SET seqno = 20000 +UPDATE hash_i4_heap + SET seqno = 20000 WHERE hash_i4_heap.random = 1492795354; -SELECT h.seqno AS i20000 +SELECT h.seqno AS i20000 FROM hash_i4_heap h WHERE h.random = 1492795354; i20000 @@ -119,7 +119,7 @@ SELECT h.seqno AS i20000 20000 (1 row) -UPDATE hash_name_heap +UPDATE hash_name_heap SET random = '0123456789abcdef'::name WHERE hash_name_heap.seqno = 6543; SELECT h.seqno AS i6543, h.random AS c0_to_f @@ -134,7 +134,7 @@ UPDATE hash_name_heap SET seqno = 20000 WHERE hash_name_heap.random = '76652222'::name; -- --- this is the row we just replaced; index scan should return zero rows +-- this is the row we just replaced; index scan should return zero rows -- SELECT h.seqno AS emptyset FROM hash_name_heap h @@ -143,7 +143,7 @@ SELECT h.seqno AS emptyset ---------- (0 rows) -UPDATE hash_txt_heap +UPDATE hash_txt_heap SET random = '0123456789abcdefghijklmnop'::text WHERE hash_txt_heap.seqno = 4002; SELECT h.seqno AS i4002, h.random AS c0_to_p @@ -168,7 +168,7 @@ SELECT h.seqno AS t20000 UPDATE hash_f8_heap SET random = '-1234.1234'::float8 WHERE hash_f8_heap.seqno = 8906; -SELECT h.seqno AS i8096, h.random AS f1234_1234 +SELECT h.seqno AS i8096, h.random AS f1234_1234 FROM hash_f8_heap h WHERE h.random = '-1234.1234'::float8; i8096 | f1234_1234 @@ -176,7 +176,7 @@ SELECT h.seqno AS i8096, h.random AS f1234_1234 8906 | -1234.1234 (1 row) -UPDATE hash_f8_heap +UPDATE hash_f8_heap SET seqno = 20000 WHERE hash_f8_heap.random = '488912369'::float8; SELECT h.seqno AS f20000 diff --git a/src/test/regress/expected/inet.out b/src/test/regress/expected/inet.out index abb59d4acf..356a397822 100644 --- a/src/test/regress/expected/inet.out +++ b/src/test/regress/expected/inet.out @@ -177,7 +177,7 @@ SELECT '' AS six, c AS cidr, i AS inet FROM INET_TBL (2 rows) SELECT '' AS ten, i, c, - i < c AS lt, i <= c AS le, i = c AS eq, + i < c AS lt, i <= c AS le, i = c AS eq, i >= c AS ge, i > c AS gt, i <> c AS ne, i << c AS sb, i <<= c AS sbe, i >> c AS sup, i >>= c AS spe diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index 581cc7d0e7..d59ca449dc 100644 --- a/src/test/regress/expected/inherit.out +++ b/src/test/regress/expected/inherit.out @@ -592,7 +592,7 @@ CREATE TABLE inhx (xx text DEFAULT 'text'); * Test double inheritance * * Ensure that defaults are NOT included unless - * INCLUDING DEFAULTS is specified + * INCLUDING DEFAULTS is specified */ CREATE TABLE inhe (ee text, LIKE inhx) inherits (b); INSERT INTO inhe VALUES ('ee-col1', 'ee-col2', DEFAULT, 'ee-col4'); diff --git a/src/test/regress/expected/int2.out b/src/test/regress/expected/int2.out index 80e6ed9fd6..021d476822 100644 --- a/src/test/regress/expected/int2.out +++ b/src/test/regress/expected/int2.out @@ -141,14 +141,14 @@ SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int4 '0'; | 32767 (3 rows) --- positive odds +-- positive odds SELECT '' AS one, i.* FROM INT2_TBL i WHERE (i.f1 % int2 '2') = int2 '1'; one | f1 -----+------- | 32767 (1 row) --- any evens +-- any evens SELECT '' AS three, i.* FROM INT2_TBL i WHERE (i.f1 % int4 '2') = int2 '0'; three | f1 -------+------- diff --git a/src/test/regress/expected/int8-exp-three-digits.out b/src/test/regress/expected/int8-exp-three-digits.out index 2108d08d87..b523bfcc01 100644 --- a/src/test/regress/expected/int8-exp-three-digits.out +++ b/src/test/regress/expected/int8-exp-three-digits.out @@ -456,7 +456,7 @@ SELECT max(q1), max(q2) FROM INT8_TBL; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') +SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') FROM INT8_TBL; to_char_1 | to_char | to_char -----------+------------------------+------------------------ @@ -467,8 +467,8 @@ SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999 | 4,567,890,123,456,789 | -4,567,890,123,456,789 (5 rows) -SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; +SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') + FROM INT8_TBL; to_char_2 | to_char | to_char -----------+--------------------------------+-------------------------------- | 123.000,000 | 456.000,000 @@ -478,7 +478,7 @@ SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2 | 4,567,890,123,456,789.000,000 | -4,567,890,123,456,789.000,000 (5 rows) -SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') +SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') FROM INT8_TBL; to_char_3 | to_char | to_char -----------+--------------------+------------------------ @@ -489,7 +489,7 @@ SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 | <4567890123456789> | 4567890123456789.000 (5 rows) -SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') +SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') FROM INT8_TBL; to_char_4 | to_char | to_char -----------+-------------------+------------------- @@ -500,7 +500,7 @@ SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * | 4567890123456789- | +4567890123456789 (5 rows) -SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; to_char_5 | to_char -----------+------------------- | 456 @@ -530,7 +530,7 @@ SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; | <4567890123456789> (5 rows) -SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; +SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; to_char_8 | to_char -----------+--------------------- | + 456th @@ -540,7 +540,7 @@ SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; to_char_9 | to_char -----------+------------------- | 0000000000000456 @@ -550,7 +550,7 @@ SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; to_char_10 | to_char ------------+------------------- | +0000000000000456 @@ -560,7 +560,7 @@ SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; to_char_11 | to_char ------------+------------------- | 0000000000000456 @@ -580,7 +580,7 @@ SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; | -4567890123456789.000 (5 rows) -SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; +SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; to_char_13 | to_char ------------+------------------------ | 456.000 diff --git a/src/test/regress/expected/int8.out b/src/test/regress/expected/int8.out index 9272dd645f..811d6a5520 100644 --- a/src/test/regress/expected/int8.out +++ b/src/test/regress/expected/int8.out @@ -456,7 +456,7 @@ SELECT max(q1), max(q2) FROM INT8_TBL; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') +SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') FROM INT8_TBL; to_char_1 | to_char | to_char -----------+------------------------+------------------------ @@ -467,8 +467,8 @@ SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999 | 4,567,890,123,456,789 | -4,567,890,123,456,789 (5 rows) -SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; +SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') + FROM INT8_TBL; to_char_2 | to_char | to_char -----------+--------------------------------+-------------------------------- | 123.000,000 | 456.000,000 @@ -478,7 +478,7 @@ SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2 | 4,567,890,123,456,789.000,000 | -4,567,890,123,456,789.000,000 (5 rows) -SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') +SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') FROM INT8_TBL; to_char_3 | to_char | to_char -----------+--------------------+------------------------ @@ -489,7 +489,7 @@ SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 | <4567890123456789> | 4567890123456789.000 (5 rows) -SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') +SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') FROM INT8_TBL; to_char_4 | to_char | to_char -----------+-------------------+------------------- @@ -500,7 +500,7 @@ SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * | 4567890123456789- | +4567890123456789 (5 rows) -SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; to_char_5 | to_char -----------+------------------- | 456 @@ -530,7 +530,7 @@ SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; | <4567890123456789> (5 rows) -SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; +SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; to_char_8 | to_char -----------+--------------------- | + 456th @@ -540,7 +540,7 @@ SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; to_char_9 | to_char -----------+------------------- | 0000000000000456 @@ -550,7 +550,7 @@ SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; to_char_10 | to_char ------------+------------------- | +0000000000000456 @@ -560,7 +560,7 @@ SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; to_char_11 | to_char ------------+------------------- | 0000000000000456 @@ -580,7 +580,7 @@ SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; | -4567890123456789.000 (5 rows) -SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; +SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; to_char_13 | to_char ------------+------------------------ | 456.000 diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out index a6f50b4622..e7e2181333 100644 --- a/src/test/regress/expected/interval.out +++ b/src/test/regress/expected/interval.out @@ -128,7 +128,7 @@ SELECT '' AS one, * FROM INTERVAL_TBL | 34 years (1 row) -SELECT '' AS five, * FROM INTERVAL_TBL +SELECT '' AS five, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 >= interval '@ 1 month'; five | f1 ------+----------------- @@ -208,11 +208,11 @@ SELECT '' AS fortyfive, r1.*, r2.* (45 rows) -- Test multiplication and division with intervals. --- Floating point arithmetic rounding errors can lead to unexpected results, --- though the code attempts to do the right thing and round up to days and --- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. --- Note that it is expected for some day components to be greater than 29 and --- some time components be greater than 23:59:59 due to how intervals are +-- Floating point arithmetic rounding errors can lead to unexpected results, +-- though the code attempts to do the right thing and round up to days and +-- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. +-- Note that it is expected for some day components to be greater than 29 and +-- some time components be greater than 23:59:59 due to how intervals are -- stored internally. CREATE TABLE INTERVAL_MULDIV_TBL (span interval); COPY INTERVAL_MULDIV_TBL FROM STDIN; @@ -753,7 +753,7 @@ select interval '1 year 2 mons 3 days 04:05:06.699999'; @ 1 year 2 mons 3 days 4 hours 5 mins 6.699999 secs (1 row) -select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; +select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; interval | interval | interval ------------+------------+------------ @ 0.7 secs | @ 0.7 secs | @ 0.7 secs diff --git a/src/test/regress/expected/limit.out b/src/test/regress/expected/limit.out index c33ebe0396..0c06ecba14 100644 --- a/src/test/regress/expected/limit.out +++ b/src/test/regress/expected/limit.out @@ -2,8 +2,8 @@ -- LIMIT -- Check the LIMIT/OFFSET feature of SELECT -- -SELECT ''::text AS two, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 50 +SELECT ''::text AS two, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 50 ORDER BY unique1 LIMIT 2; two | unique1 | unique2 | stringu1 -----+---------+---------+---------- @@ -11,8 +11,8 @@ SELECT ''::text AS two, unique1, unique2, stringu1 | 52 | 985 | ACAAAA (2 rows) -SELECT ''::text AS five, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 60 +SELECT ''::text AS five, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 60 ORDER BY unique1 LIMIT 5; five | unique1 | unique2 | stringu1 ------+---------+---------+---------- @@ -23,7 +23,7 @@ SELECT ''::text AS five, unique1, unique2, stringu1 | 65 | 64 | NCAAAA (5 rows) -SELECT ''::text AS two, unique1, unique2, stringu1 +SELECT ''::text AS two, unique1, unique2, stringu1 FROM onek WHERE unique1 > 60 AND unique1 < 63 ORDER BY unique1 LIMIT 5; two | unique1 | unique2 | stringu1 @@ -32,8 +32,8 @@ SELECT ''::text AS two, unique1, unique2, stringu1 | 62 | 633 | KCAAAA (2 rows) -SELECT ''::text AS three, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 100 +SELECT ''::text AS three, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 100 ORDER BY unique1 LIMIT 3 OFFSET 20; three | unique1 | unique2 | stringu1 -------+---------+---------+---------- @@ -42,15 +42,15 @@ SELECT ''::text AS three, unique1, unique2, stringu1 | 123 | 777 | TEAAAA (3 rows) -SELECT ''::text AS zero, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS zero, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 8 OFFSET 99; zero | unique1 | unique2 | stringu1 ------+---------+---------+---------- (0 rows) -SELECT ''::text AS eleven, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS eleven, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 20 OFFSET 39; eleven | unique1 | unique2 | stringu1 --------+---------+---------+---------- @@ -67,7 +67,7 @@ SELECT ''::text AS eleven, unique1, unique2, stringu1 | 0 | 998 | AAAAAA (11 rows) -SELECT ''::text AS ten, unique1, unique2, stringu1 +SELECT ''::text AS ten, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990; ten | unique1 | unique2 | stringu1 @@ -84,7 +84,7 @@ SELECT ''::text AS ten, unique1, unique2, stringu1 | 999 | 152 | LMAAAA (10 rows) -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990 LIMIT 5; five | unique1 | unique2 | stringu1 @@ -96,7 +96,7 @@ SELECT ''::text AS five, unique1, unique2, stringu1 | 994 | 695 | GMAAAA (5 rows) -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 LIMIT 5 OFFSET 900; five | unique1 | unique2 | stringu1 diff --git a/src/test/regress/expected/numeric.out b/src/test/regress/expected/numeric.out index 857e1d8319..d9927b7915 100644 --- a/src/test/regress/expected/numeric.out +++ b/src/test/regress/expected/numeric.out @@ -805,7 +805,7 @@ SELECT width_bucket('Infinity'::float8, 1, 10, 10), DROP TABLE width_bucket_test; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') +SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') FROM num_data; to_char_1 | to_char -----------+------------------------ @@ -869,7 +869,7 @@ SELECT '' AS to_char_4, to_char(val, '9999999999999999.999999999999999S') | 24926804.045047420000000- (10 rows) -SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; to_char_5 | to_char -----------+----------------------------------- | .000000000000000 @@ -914,7 +914,7 @@ SELECT '' AS to_char_7, to_char(val, 'FM9999999999999999.999999999999999THPR') | <24926804.04504742> (10 rows) -SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; +SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; to_char_8 | to_char -----------+----------------------------------- | + .000000000000000 @@ -929,7 +929,7 @@ SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') | - 24926804.045047420000000 (10 rows) -SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; to_char_9 | to_char -----------+----------------------------------- | 0000000000000000.000000000000000 @@ -944,7 +944,7 @@ SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') | -0000000024926804.045047420000000 (10 rows) -SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; to_char_10 | to_char ------------+----------------------------------- | +0000000000000000.000000000000000 @@ -959,7 +959,7 @@ SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') | -0000000024926804.045047420000000 (10 rows) -SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; to_char_11 | to_char ------------+----------------------------- | 0000000000000000. @@ -1034,7 +1034,7 @@ SELECT '' AS to_char_15, to_char(val, 'FM9999999990999999.099999999999999') FRO | -24926804.04504742 (10 rows) -SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; +SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; to_char_16 | to_char ------------+------------------------------------ | .000000000000000 diff --git a/src/test/regress/expected/oid.out b/src/test/regress/expected/oid.out index 008b5a246b..1eab9cc935 100644 --- a/src/test/regress/expected/oid.out +++ b/src/test/regress/expected/oid.out @@ -11,7 +11,7 @@ INSERT INTO OID_TBL(f1) VALUES ('5 '); INSERT INTO OID_TBL(f1) VALUES (' 10 '); -- leading/trailing hard tab is also allowed INSERT INTO OID_TBL(f1) VALUES (' 15 '); --- bad inputs +-- bad inputs INSERT INTO OID_TBL(f1) VALUES (''); ERROR: invalid input syntax for type oid: "" LINE 1: INSERT INTO OID_TBL(f1) VALUES (''); diff --git a/src/test/regress/expected/oidjoins.out b/src/test/regress/expected/oidjoins.out index af1a801bc6..9fa0f845cf 100644 --- a/src/test/regress/expected/oidjoins.out +++ b/src/test/regress/expected/oidjoins.out @@ -1,953 +1,953 @@ -- -- This is created by pgsql/src/tools/findoidjoins/make_oidjoins_check -- -SELECT ctid, aggfnoid -FROM pg_catalog.pg_aggregate fk -WHERE aggfnoid != 0 AND +SELECT ctid, aggfnoid +FROM pg_catalog.pg_aggregate fk +WHERE aggfnoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfnoid); ctid | aggfnoid ------+---------- (0 rows) -SELECT ctid, aggtransfn -FROM pg_catalog.pg_aggregate fk -WHERE aggtransfn != 0 AND +SELECT ctid, aggtransfn +FROM pg_catalog.pg_aggregate fk +WHERE aggtransfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggtransfn); ctid | aggtransfn ------+------------ (0 rows) -SELECT ctid, aggfinalfn -FROM pg_catalog.pg_aggregate fk -WHERE aggfinalfn != 0 AND +SELECT ctid, aggfinalfn +FROM pg_catalog.pg_aggregate fk +WHERE aggfinalfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfinalfn); ctid | aggfinalfn ------+------------ (0 rows) -SELECT ctid, aggsortop -FROM pg_catalog.pg_aggregate fk -WHERE aggsortop != 0 AND +SELECT ctid, aggsortop +FROM pg_catalog.pg_aggregate fk +WHERE aggsortop != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.aggsortop); ctid | aggsortop ------+----------- (0 rows) -SELECT ctid, aggtranstype -FROM pg_catalog.pg_aggregate fk -WHERE aggtranstype != 0 AND +SELECT ctid, aggtranstype +FROM pg_catalog.pg_aggregate fk +WHERE aggtranstype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.aggtranstype); ctid | aggtranstype ------+-------------- (0 rows) -SELECT ctid, amkeytype -FROM pg_catalog.pg_am fk -WHERE amkeytype != 0 AND +SELECT ctid, amkeytype +FROM pg_catalog.pg_am fk +WHERE amkeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amkeytype); ctid | amkeytype ------+----------- (0 rows) -SELECT ctid, aminsert -FROM pg_catalog.pg_am fk -WHERE aminsert != 0 AND +SELECT ctid, aminsert +FROM pg_catalog.pg_am fk +WHERE aminsert != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aminsert); ctid | aminsert ------+---------- (0 rows) -SELECT ctid, ambeginscan -FROM pg_catalog.pg_am fk -WHERE ambeginscan != 0 AND +SELECT ctid, ambeginscan +FROM pg_catalog.pg_am fk +WHERE ambeginscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambeginscan); ctid | ambeginscan ------+------------- (0 rows) -SELECT ctid, amgettuple -FROM pg_catalog.pg_am fk -WHERE amgettuple != 0 AND +SELECT ctid, amgettuple +FROM pg_catalog.pg_am fk +WHERE amgettuple != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgettuple); ctid | amgettuple ------+------------ (0 rows) -SELECT ctid, amgetbitmap -FROM pg_catalog.pg_am fk -WHERE amgetbitmap != 0 AND +SELECT ctid, amgetbitmap +FROM pg_catalog.pg_am fk +WHERE amgetbitmap != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgetbitmap); ctid | amgetbitmap ------+------------- (0 rows) -SELECT ctid, amrescan -FROM pg_catalog.pg_am fk -WHERE amrescan != 0 AND +SELECT ctid, amrescan +FROM pg_catalog.pg_am fk +WHERE amrescan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrescan); ctid | amrescan ------+---------- (0 rows) -SELECT ctid, amendscan -FROM pg_catalog.pg_am fk -WHERE amendscan != 0 AND +SELECT ctid, amendscan +FROM pg_catalog.pg_am fk +WHERE amendscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amendscan); ctid | amendscan ------+----------- (0 rows) -SELECT ctid, ammarkpos -FROM pg_catalog.pg_am fk -WHERE ammarkpos != 0 AND +SELECT ctid, ammarkpos +FROM pg_catalog.pg_am fk +WHERE ammarkpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ammarkpos); ctid | ammarkpos ------+----------- (0 rows) -SELECT ctid, amrestrpos -FROM pg_catalog.pg_am fk -WHERE amrestrpos != 0 AND +SELECT ctid, amrestrpos +FROM pg_catalog.pg_am fk +WHERE amrestrpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrestrpos); ctid | amrestrpos ------+------------ (0 rows) -SELECT ctid, ambuild -FROM pg_catalog.pg_am fk -WHERE ambuild != 0 AND +SELECT ctid, ambuild +FROM pg_catalog.pg_am fk +WHERE ambuild != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambuild); ctid | ambuild ------+--------- (0 rows) -SELECT ctid, ambulkdelete -FROM pg_catalog.pg_am fk -WHERE ambulkdelete != 0 AND +SELECT ctid, ambulkdelete +FROM pg_catalog.pg_am fk +WHERE ambulkdelete != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambulkdelete); ctid | ambulkdelete ------+-------------- (0 rows) -SELECT ctid, amvacuumcleanup -FROM pg_catalog.pg_am fk -WHERE amvacuumcleanup != 0 AND +SELECT ctid, amvacuumcleanup +FROM pg_catalog.pg_am fk +WHERE amvacuumcleanup != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amvacuumcleanup); ctid | amvacuumcleanup ------+----------------- (0 rows) -SELECT ctid, amcostestimate -FROM pg_catalog.pg_am fk -WHERE amcostestimate != 0 AND +SELECT ctid, amcostestimate +FROM pg_catalog.pg_am fk +WHERE amcostestimate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amcostestimate); ctid | amcostestimate ------+---------------- (0 rows) -SELECT ctid, amoptions -FROM pg_catalog.pg_am fk -WHERE amoptions != 0 AND +SELECT ctid, amoptions +FROM pg_catalog.pg_am fk +WHERE amoptions != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amoptions); ctid | amoptions ------+----------- (0 rows) -SELECT ctid, amopfamily -FROM pg_catalog.pg_amop fk -WHERE amopfamily != 0 AND +SELECT ctid, amopfamily +FROM pg_catalog.pg_amop fk +WHERE amopfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amopfamily); ctid | amopfamily ------+------------ (0 rows) -SELECT ctid, amoplefttype -FROM pg_catalog.pg_amop fk -WHERE amoplefttype != 0 AND +SELECT ctid, amoplefttype +FROM pg_catalog.pg_amop fk +WHERE amoplefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoplefttype); ctid | amoplefttype ------+-------------- (0 rows) -SELECT ctid, amoprighttype -FROM pg_catalog.pg_amop fk -WHERE amoprighttype != 0 AND +SELECT ctid, amoprighttype +FROM pg_catalog.pg_amop fk +WHERE amoprighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoprighttype); ctid | amoprighttype ------+--------------- (0 rows) -SELECT ctid, amopopr -FROM pg_catalog.pg_amop fk -WHERE amopopr != 0 AND +SELECT ctid, amopopr +FROM pg_catalog.pg_amop fk +WHERE amopopr != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.amopopr); ctid | amopopr ------+--------- (0 rows) -SELECT ctid, amopmethod -FROM pg_catalog.pg_amop fk -WHERE amopmethod != 0 AND +SELECT ctid, amopmethod +FROM pg_catalog.pg_amop fk +WHERE amopmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.amopmethod); ctid | amopmethod ------+------------ (0 rows) -SELECT ctid, amprocfamily -FROM pg_catalog.pg_amproc fk -WHERE amprocfamily != 0 AND +SELECT ctid, amprocfamily +FROM pg_catalog.pg_amproc fk +WHERE amprocfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amprocfamily); ctid | amprocfamily ------+-------------- (0 rows) -SELECT ctid, amproclefttype -FROM pg_catalog.pg_amproc fk -WHERE amproclefttype != 0 AND +SELECT ctid, amproclefttype +FROM pg_catalog.pg_amproc fk +WHERE amproclefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amproclefttype); ctid | amproclefttype ------+---------------- (0 rows) -SELECT ctid, amprocrighttype -FROM pg_catalog.pg_amproc fk -WHERE amprocrighttype != 0 AND +SELECT ctid, amprocrighttype +FROM pg_catalog.pg_amproc fk +WHERE amprocrighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amprocrighttype); ctid | amprocrighttype ------+----------------- (0 rows) -SELECT ctid, amproc -FROM pg_catalog.pg_amproc fk -WHERE amproc != 0 AND +SELECT ctid, amproc +FROM pg_catalog.pg_amproc fk +WHERE amproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amproc); ctid | amproc ------+-------- (0 rows) -SELECT ctid, attrelid -FROM pg_catalog.pg_attribute fk -WHERE attrelid != 0 AND +SELECT ctid, attrelid +FROM pg_catalog.pg_attribute fk +WHERE attrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.attrelid); ctid | attrelid ------+---------- (0 rows) -SELECT ctid, atttypid -FROM pg_catalog.pg_attribute fk -WHERE atttypid != 0 AND +SELECT ctid, atttypid +FROM pg_catalog.pg_attribute fk +WHERE atttypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.atttypid); ctid | atttypid ------+---------- (0 rows) -SELECT ctid, castsource -FROM pg_catalog.pg_cast fk -WHERE castsource != 0 AND +SELECT ctid, castsource +FROM pg_catalog.pg_cast fk +WHERE castsource != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.castsource); ctid | castsource ------+------------ (0 rows) -SELECT ctid, casttarget -FROM pg_catalog.pg_cast fk -WHERE casttarget != 0 AND +SELECT ctid, casttarget +FROM pg_catalog.pg_cast fk +WHERE casttarget != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.casttarget); ctid | casttarget ------+------------ (0 rows) -SELECT ctid, castfunc -FROM pg_catalog.pg_cast fk -WHERE castfunc != 0 AND +SELECT ctid, castfunc +FROM pg_catalog.pg_cast fk +WHERE castfunc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.castfunc); ctid | castfunc ------+---------- (0 rows) -SELECT ctid, relnamespace -FROM pg_catalog.pg_class fk -WHERE relnamespace != 0 AND +SELECT ctid, relnamespace +FROM pg_catalog.pg_class fk +WHERE relnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.relnamespace); ctid | relnamespace ------+-------------- (0 rows) -SELECT ctid, reltype -FROM pg_catalog.pg_class fk -WHERE reltype != 0 AND +SELECT ctid, reltype +FROM pg_catalog.pg_class fk +WHERE reltype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.reltype); ctid | reltype ------+--------- (0 rows) -SELECT ctid, relowner -FROM pg_catalog.pg_class fk -WHERE relowner != 0 AND +SELECT ctid, relowner +FROM pg_catalog.pg_class fk +WHERE relowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.relowner); ctid | relowner ------+---------- (0 rows) -SELECT ctid, relam -FROM pg_catalog.pg_class fk -WHERE relam != 0 AND +SELECT ctid, relam +FROM pg_catalog.pg_class fk +WHERE relam != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.relam); ctid | relam ------+------- (0 rows) -SELECT ctid, reltablespace -FROM pg_catalog.pg_class fk -WHERE reltablespace != 0 AND +SELECT ctid, reltablespace +FROM pg_catalog.pg_class fk +WHERE reltablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.reltablespace); ctid | reltablespace ------+--------------- (0 rows) -SELECT ctid, reltoastrelid -FROM pg_catalog.pg_class fk -WHERE reltoastrelid != 0 AND +SELECT ctid, reltoastrelid +FROM pg_catalog.pg_class fk +WHERE reltoastrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastrelid); ctid | reltoastrelid ------+--------------- (0 rows) -SELECT ctid, reltoastidxid -FROM pg_catalog.pg_class fk -WHERE reltoastidxid != 0 AND +SELECT ctid, reltoastidxid +FROM pg_catalog.pg_class fk +WHERE reltoastidxid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastidxid); ctid | reltoastidxid ------+--------------- (0 rows) -SELECT ctid, connamespace -FROM pg_catalog.pg_constraint fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_constraint fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); ctid | connamespace ------+-------------- (0 rows) -SELECT ctid, contypid -FROM pg_catalog.pg_constraint fk -WHERE contypid != 0 AND +SELECT ctid, contypid +FROM pg_catalog.pg_constraint fk +WHERE contypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.contypid); ctid | contypid ------+---------- (0 rows) -SELECT ctid, connamespace -FROM pg_catalog.pg_conversion fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_conversion fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); ctid | connamespace ------+-------------- (0 rows) -SELECT ctid, conowner -FROM pg_catalog.pg_conversion fk -WHERE conowner != 0 AND +SELECT ctid, conowner +FROM pg_catalog.pg_conversion fk +WHERE conowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.conowner); ctid | conowner ------+---------- (0 rows) -SELECT ctid, conproc -FROM pg_catalog.pg_conversion fk -WHERE conproc != 0 AND +SELECT ctid, conproc +FROM pg_catalog.pg_conversion fk +WHERE conproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.conproc); ctid | conproc ------+--------- (0 rows) -SELECT ctid, datdba -FROM pg_catalog.pg_database fk -WHERE datdba != 0 AND +SELECT ctid, datdba +FROM pg_catalog.pg_database fk +WHERE datdba != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.datdba); ctid | datdba ------+-------- (0 rows) -SELECT ctid, dattablespace -FROM pg_catalog.pg_database fk -WHERE dattablespace != 0 AND +SELECT ctid, dattablespace +FROM pg_catalog.pg_database fk +WHERE dattablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.dattablespace); ctid | dattablespace ------+--------------- (0 rows) -SELECT ctid, setdatabase -FROM pg_catalog.pg_db_role_setting fk -WHERE setdatabase != 0 AND +SELECT ctid, setdatabase +FROM pg_catalog.pg_db_role_setting fk +WHERE setdatabase != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_database pk WHERE pk.oid = fk.setdatabase); ctid | setdatabase ------+------------- (0 rows) -SELECT ctid, classid -FROM pg_catalog.pg_depend fk -WHERE classid != 0 AND +SELECT ctid, classid +FROM pg_catalog.pg_depend fk +WHERE classid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classid); ctid | classid ------+--------- (0 rows) -SELECT ctid, refclassid -FROM pg_catalog.pg_depend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_depend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); ctid | refclassid ------+------------ (0 rows) -SELECT ctid, classoid -FROM pg_catalog.pg_description fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_description fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); ctid | classoid ------+---------- (0 rows) -SELECT ctid, indexrelid -FROM pg_catalog.pg_index fk -WHERE indexrelid != 0 AND +SELECT ctid, indexrelid +FROM pg_catalog.pg_index fk +WHERE indexrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indexrelid); ctid | indexrelid ------+------------ (0 rows) -SELECT ctid, indrelid -FROM pg_catalog.pg_index fk -WHERE indrelid != 0 AND +SELECT ctid, indrelid +FROM pg_catalog.pg_index fk +WHERE indrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indrelid); ctid | indrelid ------+---------- (0 rows) -SELECT ctid, lanowner -FROM pg_catalog.pg_language fk -WHERE lanowner != 0 AND +SELECT ctid, lanowner +FROM pg_catalog.pg_language fk +WHERE lanowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner); ctid | lanowner ------+---------- (0 rows) -SELECT ctid, lanplcallfoid -FROM pg_catalog.pg_language fk -WHERE lanplcallfoid != 0 AND +SELECT ctid, lanplcallfoid +FROM pg_catalog.pg_language fk +WHERE lanplcallfoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanplcallfoid); ctid | lanplcallfoid ------+--------------- (0 rows) -SELECT ctid, laninline -FROM pg_catalog.pg_language fk -WHERE laninline != 0 AND +SELECT ctid, laninline +FROM pg_catalog.pg_language fk +WHERE laninline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.laninline); ctid | laninline ------+----------- (0 rows) -SELECT ctid, lanvalidator -FROM pg_catalog.pg_language fk -WHERE lanvalidator != 0 AND +SELECT ctid, lanvalidator +FROM pg_catalog.pg_language fk +WHERE lanvalidator != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanvalidator); ctid | lanvalidator ------+-------------- (0 rows) -SELECT ctid, nspowner -FROM pg_catalog.pg_namespace fk -WHERE nspowner != 0 AND +SELECT ctid, nspowner +FROM pg_catalog.pg_namespace fk +WHERE nspowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.nspowner); ctid | nspowner ------+---------- (0 rows) -SELECT ctid, opcmethod -FROM pg_catalog.pg_opclass fk -WHERE opcmethod != 0 AND +SELECT ctid, opcmethod +FROM pg_catalog.pg_opclass fk +WHERE opcmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opcmethod); ctid | opcmethod ------+----------- (0 rows) -SELECT ctid, opcnamespace -FROM pg_catalog.pg_opclass fk -WHERE opcnamespace != 0 AND +SELECT ctid, opcnamespace +FROM pg_catalog.pg_opclass fk +WHERE opcnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opcnamespace); ctid | opcnamespace ------+-------------- (0 rows) -SELECT ctid, opcowner -FROM pg_catalog.pg_opclass fk -WHERE opcowner != 0 AND +SELECT ctid, opcowner +FROM pg_catalog.pg_opclass fk +WHERE opcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opcowner); ctid | opcowner ------+---------- (0 rows) -SELECT ctid, opcfamily -FROM pg_catalog.pg_opclass fk -WHERE opcfamily != 0 AND +SELECT ctid, opcfamily +FROM pg_catalog.pg_opclass fk +WHERE opcfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.opcfamily); ctid | opcfamily ------+----------- (0 rows) -SELECT ctid, opcintype -FROM pg_catalog.pg_opclass fk -WHERE opcintype != 0 AND +SELECT ctid, opcintype +FROM pg_catalog.pg_opclass fk +WHERE opcintype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opcintype); ctid | opcintype ------+----------- (0 rows) -SELECT ctid, opckeytype -FROM pg_catalog.pg_opclass fk -WHERE opckeytype != 0 AND +SELECT ctid, opckeytype +FROM pg_catalog.pg_opclass fk +WHERE opckeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opckeytype); ctid | opckeytype ------+------------ (0 rows) -SELECT ctid, oprnamespace -FROM pg_catalog.pg_operator fk -WHERE oprnamespace != 0 AND +SELECT ctid, oprnamespace +FROM pg_catalog.pg_operator fk +WHERE oprnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.oprnamespace); ctid | oprnamespace ------+-------------- (0 rows) -SELECT ctid, oprowner -FROM pg_catalog.pg_operator fk -WHERE oprowner != 0 AND +SELECT ctid, oprowner +FROM pg_catalog.pg_operator fk +WHERE oprowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.oprowner); ctid | oprowner ------+---------- (0 rows) -SELECT ctid, oprleft -FROM pg_catalog.pg_operator fk -WHERE oprleft != 0 AND +SELECT ctid, oprleft +FROM pg_catalog.pg_operator fk +WHERE oprleft != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprleft); ctid | oprleft ------+--------- (0 rows) -SELECT ctid, oprright -FROM pg_catalog.pg_operator fk -WHERE oprright != 0 AND +SELECT ctid, oprright +FROM pg_catalog.pg_operator fk +WHERE oprright != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprright); ctid | oprright ------+---------- (0 rows) -SELECT ctid, oprresult -FROM pg_catalog.pg_operator fk -WHERE oprresult != 0 AND +SELECT ctid, oprresult +FROM pg_catalog.pg_operator fk +WHERE oprresult != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprresult); ctid | oprresult ------+----------- (0 rows) -SELECT ctid, oprcom -FROM pg_catalog.pg_operator fk -WHERE oprcom != 0 AND +SELECT ctid, oprcom +FROM pg_catalog.pg_operator fk +WHERE oprcom != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprcom); ctid | oprcom ------+-------- (0 rows) -SELECT ctid, oprnegate -FROM pg_catalog.pg_operator fk -WHERE oprnegate != 0 AND +SELECT ctid, oprnegate +FROM pg_catalog.pg_operator fk +WHERE oprnegate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprnegate); ctid | oprnegate ------+----------- (0 rows) -SELECT ctid, oprcode -FROM pg_catalog.pg_operator fk -WHERE oprcode != 0 AND +SELECT ctid, oprcode +FROM pg_catalog.pg_operator fk +WHERE oprcode != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprcode); ctid | oprcode ------+--------- (0 rows) -SELECT ctid, oprrest -FROM pg_catalog.pg_operator fk -WHERE oprrest != 0 AND +SELECT ctid, oprrest +FROM pg_catalog.pg_operator fk +WHERE oprrest != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprrest); ctid | oprrest ------+--------- (0 rows) -SELECT ctid, oprjoin -FROM pg_catalog.pg_operator fk -WHERE oprjoin != 0 AND +SELECT ctid, oprjoin +FROM pg_catalog.pg_operator fk +WHERE oprjoin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprjoin); ctid | oprjoin ------+--------- (0 rows) -SELECT ctid, opfmethod -FROM pg_catalog.pg_opfamily fk -WHERE opfmethod != 0 AND +SELECT ctid, opfmethod +FROM pg_catalog.pg_opfamily fk +WHERE opfmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opfmethod); ctid | opfmethod ------+----------- (0 rows) -SELECT ctid, opfnamespace -FROM pg_catalog.pg_opfamily fk -WHERE opfnamespace != 0 AND +SELECT ctid, opfnamespace +FROM pg_catalog.pg_opfamily fk +WHERE opfnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opfnamespace); ctid | opfnamespace ------+-------------- (0 rows) -SELECT ctid, opfowner -FROM pg_catalog.pg_opfamily fk -WHERE opfowner != 0 AND +SELECT ctid, opfowner +FROM pg_catalog.pg_opfamily fk +WHERE opfowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opfowner); ctid | opfowner ------+---------- (0 rows) -SELECT ctid, pronamespace -FROM pg_catalog.pg_proc fk -WHERE pronamespace != 0 AND +SELECT ctid, pronamespace +FROM pg_catalog.pg_proc fk +WHERE pronamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.pronamespace); ctid | pronamespace ------+-------------- (0 rows) -SELECT ctid, proowner -FROM pg_catalog.pg_proc fk -WHERE proowner != 0 AND +SELECT ctid, proowner +FROM pg_catalog.pg_proc fk +WHERE proowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.proowner); ctid | proowner ------+---------- (0 rows) -SELECT ctid, prolang -FROM pg_catalog.pg_proc fk -WHERE prolang != 0 AND +SELECT ctid, prolang +FROM pg_catalog.pg_proc fk +WHERE prolang != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_language pk WHERE pk.oid = fk.prolang); ctid | prolang ------+--------- (0 rows) -SELECT ctid, prorettype -FROM pg_catalog.pg_proc fk -WHERE prorettype != 0 AND +SELECT ctid, prorettype +FROM pg_catalog.pg_proc fk +WHERE prorettype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.prorettype); ctid | prorettype ------+------------ (0 rows) -SELECT ctid, ev_class -FROM pg_catalog.pg_rewrite fk -WHERE ev_class != 0 AND +SELECT ctid, ev_class +FROM pg_catalog.pg_rewrite fk +WHERE ev_class != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.ev_class); ctid | ev_class ------+---------- (0 rows) -SELECT ctid, refclassid -FROM pg_catalog.pg_shdepend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_shdepend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); ctid | refclassid ------+------------ (0 rows) -SELECT ctid, classoid -FROM pg_catalog.pg_shdescription fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_shdescription fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); ctid | classoid ------+---------- (0 rows) -SELECT ctid, starelid -FROM pg_catalog.pg_statistic fk -WHERE starelid != 0 AND +SELECT ctid, starelid +FROM pg_catalog.pg_statistic fk +WHERE starelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.starelid); ctid | starelid ------+---------- (0 rows) -SELECT ctid, staop1 -FROM pg_catalog.pg_statistic fk -WHERE staop1 != 0 AND +SELECT ctid, staop1 +FROM pg_catalog.pg_statistic fk +WHERE staop1 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop1); ctid | staop1 ------+-------- (0 rows) -SELECT ctid, staop2 -FROM pg_catalog.pg_statistic fk -WHERE staop2 != 0 AND +SELECT ctid, staop2 +FROM pg_catalog.pg_statistic fk +WHERE staop2 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop2); ctid | staop2 ------+-------- (0 rows) -SELECT ctid, staop3 -FROM pg_catalog.pg_statistic fk -WHERE staop3 != 0 AND +SELECT ctid, staop3 +FROM pg_catalog.pg_statistic fk +WHERE staop3 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop3); ctid | staop3 ------+-------- (0 rows) -SELECT ctid, spcowner -FROM pg_catalog.pg_tablespace fk -WHERE spcowner != 0 AND +SELECT ctid, spcowner +FROM pg_catalog.pg_tablespace fk +WHERE spcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.spcowner); ctid | spcowner ------+---------- (0 rows) -SELECT ctid, cfgnamespace -FROM pg_catalog.pg_ts_config fk -WHERE cfgnamespace != 0 AND +SELECT ctid, cfgnamespace +FROM pg_catalog.pg_ts_config fk +WHERE cfgnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.cfgnamespace); ctid | cfgnamespace ------+-------------- (0 rows) -SELECT ctid, cfgowner -FROM pg_catalog.pg_ts_config fk -WHERE cfgowner != 0 AND +SELECT ctid, cfgowner +FROM pg_catalog.pg_ts_config fk +WHERE cfgowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.cfgowner); ctid | cfgowner ------+---------- (0 rows) -SELECT ctid, cfgparser -FROM pg_catalog.pg_ts_config fk -WHERE cfgparser != 0 AND +SELECT ctid, cfgparser +FROM pg_catalog.pg_ts_config fk +WHERE cfgparser != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_parser pk WHERE pk.oid = fk.cfgparser); ctid | cfgparser ------+----------- (0 rows) -SELECT ctid, mapcfg -FROM pg_catalog.pg_ts_config_map fk -WHERE mapcfg != 0 AND +SELECT ctid, mapcfg +FROM pg_catalog.pg_ts_config_map fk +WHERE mapcfg != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_config pk WHERE pk.oid = fk.mapcfg); ctid | mapcfg ------+-------- (0 rows) -SELECT ctid, mapdict -FROM pg_catalog.pg_ts_config_map fk -WHERE mapdict != 0 AND +SELECT ctid, mapdict +FROM pg_catalog.pg_ts_config_map fk +WHERE mapdict != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_dict pk WHERE pk.oid = fk.mapdict); ctid | mapdict ------+--------- (0 rows) -SELECT ctid, dictnamespace -FROM pg_catalog.pg_ts_dict fk -WHERE dictnamespace != 0 AND +SELECT ctid, dictnamespace +FROM pg_catalog.pg_ts_dict fk +WHERE dictnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.dictnamespace); ctid | dictnamespace ------+--------------- (0 rows) -SELECT ctid, dictowner -FROM pg_catalog.pg_ts_dict fk -WHERE dictowner != 0 AND +SELECT ctid, dictowner +FROM pg_catalog.pg_ts_dict fk +WHERE dictowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.dictowner); ctid | dictowner ------+----------- (0 rows) -SELECT ctid, dicttemplate -FROM pg_catalog.pg_ts_dict fk -WHERE dicttemplate != 0 AND +SELECT ctid, dicttemplate +FROM pg_catalog.pg_ts_dict fk +WHERE dicttemplate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_template pk WHERE pk.oid = fk.dicttemplate); ctid | dicttemplate ------+-------------- (0 rows) -SELECT ctid, prsnamespace -FROM pg_catalog.pg_ts_parser fk -WHERE prsnamespace != 0 AND +SELECT ctid, prsnamespace +FROM pg_catalog.pg_ts_parser fk +WHERE prsnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.prsnamespace); ctid | prsnamespace ------+-------------- (0 rows) -SELECT ctid, prsstart -FROM pg_catalog.pg_ts_parser fk -WHERE prsstart != 0 AND +SELECT ctid, prsstart +FROM pg_catalog.pg_ts_parser fk +WHERE prsstart != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsstart); ctid | prsstart ------+---------- (0 rows) -SELECT ctid, prstoken -FROM pg_catalog.pg_ts_parser fk -WHERE prstoken != 0 AND +SELECT ctid, prstoken +FROM pg_catalog.pg_ts_parser fk +WHERE prstoken != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prstoken); ctid | prstoken ------+---------- (0 rows) -SELECT ctid, prsend -FROM pg_catalog.pg_ts_parser fk -WHERE prsend != 0 AND +SELECT ctid, prsend +FROM pg_catalog.pg_ts_parser fk +WHERE prsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsend); ctid | prsend ------+-------- (0 rows) -SELECT ctid, prsheadline -FROM pg_catalog.pg_ts_parser fk -WHERE prsheadline != 0 AND +SELECT ctid, prsheadline +FROM pg_catalog.pg_ts_parser fk +WHERE prsheadline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsheadline); ctid | prsheadline ------+------------- (0 rows) -SELECT ctid, prslextype -FROM pg_catalog.pg_ts_parser fk -WHERE prslextype != 0 AND +SELECT ctid, prslextype +FROM pg_catalog.pg_ts_parser fk +WHERE prslextype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prslextype); ctid | prslextype ------+------------ (0 rows) -SELECT ctid, tmplnamespace -FROM pg_catalog.pg_ts_template fk -WHERE tmplnamespace != 0 AND +SELECT ctid, tmplnamespace +FROM pg_catalog.pg_ts_template fk +WHERE tmplnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.tmplnamespace); ctid | tmplnamespace ------+--------------- (0 rows) -SELECT ctid, tmplinit -FROM pg_catalog.pg_ts_template fk -WHERE tmplinit != 0 AND +SELECT ctid, tmplinit +FROM pg_catalog.pg_ts_template fk +WHERE tmplinit != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmplinit); ctid | tmplinit ------+---------- (0 rows) -SELECT ctid, tmpllexize -FROM pg_catalog.pg_ts_template fk -WHERE tmpllexize != 0 AND +SELECT ctid, tmpllexize +FROM pg_catalog.pg_ts_template fk +WHERE tmpllexize != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmpllexize); ctid | tmpllexize ------+------------ (0 rows) -SELECT ctid, typnamespace -FROM pg_catalog.pg_type fk -WHERE typnamespace != 0 AND +SELECT ctid, typnamespace +FROM pg_catalog.pg_type fk +WHERE typnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.typnamespace); ctid | typnamespace ------+-------------- (0 rows) -SELECT ctid, typowner -FROM pg_catalog.pg_type fk -WHERE typowner != 0 AND +SELECT ctid, typowner +FROM pg_catalog.pg_type fk +WHERE typowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.typowner); ctid | typowner ------+---------- (0 rows) -SELECT ctid, typrelid -FROM pg_catalog.pg_type fk -WHERE typrelid != 0 AND +SELECT ctid, typrelid +FROM pg_catalog.pg_type fk +WHERE typrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.typrelid); ctid | typrelid ------+---------- (0 rows) -SELECT ctid, typelem -FROM pg_catalog.pg_type fk -WHERE typelem != 0 AND +SELECT ctid, typelem +FROM pg_catalog.pg_type fk +WHERE typelem != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typelem); ctid | typelem ------+--------- (0 rows) -SELECT ctid, typarray -FROM pg_catalog.pg_type fk -WHERE typarray != 0 AND +SELECT ctid, typarray +FROM pg_catalog.pg_type fk +WHERE typarray != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray); ctid | typarray ------+---------- (0 rows) -SELECT ctid, typinput -FROM pg_catalog.pg_type fk -WHERE typinput != 0 AND +SELECT ctid, typinput +FROM pg_catalog.pg_type fk +WHERE typinput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typinput); ctid | typinput ------+---------- (0 rows) -SELECT ctid, typoutput -FROM pg_catalog.pg_type fk -WHERE typoutput != 0 AND +SELECT ctid, typoutput +FROM pg_catalog.pg_type fk +WHERE typoutput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typoutput); ctid | typoutput ------+----------- (0 rows) -SELECT ctid, typreceive -FROM pg_catalog.pg_type fk -WHERE typreceive != 0 AND +SELECT ctid, typreceive +FROM pg_catalog.pg_type fk +WHERE typreceive != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typreceive); ctid | typreceive ------+------------ (0 rows) -SELECT ctid, typsend -FROM pg_catalog.pg_type fk -WHERE typsend != 0 AND +SELECT ctid, typsend +FROM pg_catalog.pg_type fk +WHERE typsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typsend); ctid | typsend ------+--------- (0 rows) -SELECT ctid, typmodin -FROM pg_catalog.pg_type fk -WHERE typmodin != 0 AND +SELECT ctid, typmodin +FROM pg_catalog.pg_type fk +WHERE typmodin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodin); ctid | typmodin ------+---------- (0 rows) -SELECT ctid, typmodout -FROM pg_catalog.pg_type fk -WHERE typmodout != 0 AND +SELECT ctid, typmodout +FROM pg_catalog.pg_type fk +WHERE typmodout != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodout); ctid | typmodout ------+----------- (0 rows) -SELECT ctid, typanalyze -FROM pg_catalog.pg_type fk -WHERE typanalyze != 0 AND +SELECT ctid, typanalyze +FROM pg_catalog.pg_type fk +WHERE typanalyze != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typanalyze); ctid | typanalyze ------+------------ (0 rows) -SELECT ctid, typbasetype -FROM pg_catalog.pg_type fk -WHERE typbasetype != 0 AND +SELECT ctid, typbasetype +FROM pg_catalog.pg_type fk +WHERE typbasetype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typbasetype); ctid | typbasetype ------+------------- diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out index a02da98011..22ccce212c 100644 --- a/src/test/regress/expected/plpgsql.out +++ b/src/test/regress/expected/plpgsql.out @@ -3220,7 +3220,7 @@ NOTICE: 6 drop function exc_using(int, text); create or replace function exc_using(int) returns void as $$ -declare +declare c refcursor; i int; begin @@ -3231,7 +3231,7 @@ begin raise notice '%', i; end loop; close c; - return; + return; end; $$ language plpgsql; select exc_using(5); diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out index 278837d091..7929229b16 100644 --- a/src/test/regress/expected/point.out +++ b/src/test/regress/expected/point.out @@ -7,7 +7,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(-10.0,0.0)'); INSERT INTO POINT_TBL(f1) VALUES ('(-3.0,4.0)'); INSERT INTO POINT_TBL(f1) VALUES ('(5.1, 34.5)'); INSERT INTO POINT_TBL(f1) VALUES ('(-5.0,-12.0)'); --- bad format points +-- bad format points INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); ERROR: invalid input syntax for type point: "asdfasdf" LINE 1: INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); @@ -32,7 +32,7 @@ SELECT '' AS six, * FROM POINT_TBL; | (10,10) (6 rows) --- left of +-- left of SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; three | f1 -------+---------- @@ -41,7 +41,7 @@ SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; | (-5,-12) (3 rows) --- right of +-- right of SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1; three | f1 -------+---------- @@ -50,28 +50,28 @@ SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1; | (-5,-12) (3 rows) --- above +-- above SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >^ p.f1; one | f1 -----+---------- | (-5,-12) (1 row) --- below +-- below SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 <^ '(0.0, 0.0)'; one | f1 -----+---------- | (-5,-12) (1 row) --- equal +-- equal SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 ~= '(5.1, 34.5)'; one | f1 -----+------------ | (5.1,34.5) (1 row) --- point in box +-- point in box SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 <@ box '(0,0,100,100)'; three | f1 @@ -235,7 +235,7 @@ SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dis -- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10 SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance - FROM POINT_TBL p1, POINT_TBL p2 + FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1 ORDER BY distance; three | point1 | point2 | distance diff --git a/src/test/regress/expected/polygon.out b/src/test/regress/expected/polygon.out index 7e0ae24266..b252902720 100644 --- a/src/test/regress/expected/polygon.out +++ b/src/test/regress/expected/polygon.out @@ -16,10 +16,10 @@ CREATE TABLE POLYGON_TBL(f1 polygon); INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)'); --- degenerate polygons +-- degenerate polygons INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)'); --- bad polygon input strings +-- bad polygon input strings INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); ERROR: invalid input syntax for type polygon: "0.0" LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); @@ -49,7 +49,7 @@ SELECT '' AS four, * FROM POLYGON_TBL; | ((0,1),(0,1)) (4 rows) --- overlap +-- overlap SELECT '' AS three, p.* FROM POLYGON_TBL p WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -59,8 +59,8 @@ SELECT '' AS three, p.* | ((3,1),(3,3),(1,0)) (2 rows) --- left overlap -SELECT '' AS four, p.* +-- left overlap +SELECT '' AS four, p.* FROM POLYGON_TBL p WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; four | f1 @@ -71,8 +71,8 @@ SELECT '' AS four, p.* | ((0,1),(0,1)) (4 rows) --- right overlap -SELECT '' AS two, p.* +-- right overlap +SELECT '' AS two, p.* FROM POLYGON_TBL p WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; two | f1 @@ -80,7 +80,7 @@ SELECT '' AS two, p.* | ((3,1),(3,3),(1,0)) (1 row) --- left of +-- left of SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -90,7 +90,7 @@ SELECT '' AS one, p.* | ((0,1),(0,1)) (2 rows) --- right of +-- right of SELECT '' AS zero, p.* FROM POLYGON_TBL p WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -98,8 +98,8 @@ SELECT '' AS zero, p.* ------+---- (0 rows) --- contained -SELECT '' AS one, p.* +-- contained +SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; one | f1 @@ -107,7 +107,7 @@ SELECT '' AS one, p.* | ((3,1),(3,3),(1,0)) (1 row) --- same +-- same SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -116,7 +116,7 @@ SELECT '' AS one, p.* | ((3,1),(3,3),(1,0)) (1 row) --- contains +-- contains SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -138,42 +138,42 @@ SELECT '' AS one, p.* -- -- 0 1 2 3 4 -- --- left of +-- left of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- left overlap +-- left overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; true ------ f (1 row) --- right overlap +-- right overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' &> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- right of +-- right of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' >> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- contained in +-- contained in SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- contains +-- contains SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- @@ -182,7 +182,7 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),( -- +------------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +------------------------+ -- 3 @@ -195,10 +195,10 @@ SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))' (1 row) -- +-----------+ --- | *---* / --- | | |/ --- | | + --- | | |\ +-- | *---* / +-- | | |/ +-- | | + +-- | | |\ -- | *---* \ -- +-----------+ SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true"; @@ -233,14 +233,14 @@ SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::poly t (1 row) --- same +-- same SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- overlap +-- overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; true ------ @@ -249,7 +249,7 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),( -- +--------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +--------------------+ -- 3 diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out index be7348d6b2..01152a939d 100644 --- a/src/test/regress/expected/portals.out +++ b/src/test/regress/expected/portals.out @@ -1244,16 +1244,16 @@ ERROR: WHERE CURRENT OF on a view is not implemented ROLLBACK; -- Make sure snapshot management works okay, per bug report in -- 235395b90909301035v7228ce63q392931f15aa74b31@mail.gmail.com -BEGIN; -SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -CREATE TABLE cursor (a int); -INSERT INTO cursor VALUES (1); -DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; -UPDATE cursor SET a = 2; -FETCH ALL FROM c1; +BEGIN; +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; +CREATE TABLE cursor (a int); +INSERT INTO cursor VALUES (1); +DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; +UPDATE cursor SET a = 2; +FETCH ALL FROM c1; a --- (0 rows) -COMMIT; +COMMIT; DROP TABLE cursor; diff --git a/src/test/regress/expected/portals_p2.out b/src/test/regress/expected/portals_p2.out index 7a9cf69674..1e2365a2a6 100644 --- a/src/test/regress/expected/portals_p2.out +++ b/src/test/regress/expected/portals_p2.out @@ -2,31 +2,31 @@ -- PORTALS_P2 -- BEGIN; -DECLARE foo13 CURSOR FOR +DECLARE foo13 CURSOR FOR SELECT * FROM onek WHERE unique1 = 50; -DECLARE foo14 CURSOR FOR +DECLARE foo14 CURSOR FOR SELECT * FROM onek WHERE unique1 = 51; -DECLARE foo15 CURSOR FOR +DECLARE foo15 CURSOR FOR SELECT * FROM onek WHERE unique1 = 52; -DECLARE foo16 CURSOR FOR +DECLARE foo16 CURSOR FOR SELECT * FROM onek WHERE unique1 = 53; -DECLARE foo17 CURSOR FOR +DECLARE foo17 CURSOR FOR SELECT * FROM onek WHERE unique1 = 54; -DECLARE foo18 CURSOR FOR +DECLARE foo18 CURSOR FOR SELECT * FROM onek WHERE unique1 = 55; -DECLARE foo19 CURSOR FOR +DECLARE foo19 CURSOR FOR SELECT * FROM onek WHERE unique1 = 56; -DECLARE foo20 CURSOR FOR +DECLARE foo20 CURSOR FOR SELECT * FROM onek WHERE unique1 = 57; -DECLARE foo21 CURSOR FOR +DECLARE foo21 CURSOR FOR SELECT * FROM onek WHERE unique1 = 58; -DECLARE foo22 CURSOR FOR +DECLARE foo22 CURSOR FOR SELECT * FROM onek WHERE unique1 = 59; -DECLARE foo23 CURSOR FOR +DECLARE foo23 CURSOR FOR SELECT * FROM onek WHERE unique1 = 60; -DECLARE foo24 CURSOR FOR +DECLARE foo24 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 50; -DECLARE foo25 CURSOR FOR +DECLARE foo25 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 60; FETCH all in foo13; unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index be65be91dd..5673f72173 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -35,9 +35,9 @@ create table rtest_interface (sysname text, ifname text); create table rtest_person (pname text, pdesc text); create table rtest_admin (pname text, sysname text); create rule rtest_sys_upd as on update to rtest_system do also ( - update rtest_interface set sysname = new.sysname + update rtest_interface set sysname = new.sysname where sysname = old.sysname; - update rtest_admin set sysname = new.sysname + update rtest_admin set sysname = new.sysname where sysname = old.sysname ); create rule rtest_sys_del as on delete to rtest_system do also ( @@ -65,7 +65,7 @@ create rule rtest_emp_del as on delete to rtest_emp do 'fired', '0.00', old.salary); -- -- Tables and rules for the multiple cascaded qualified instead --- rule test +-- rule test -- create table rtest_t4 (a int4, b text); create table rtest_t5 (a int4, b text); @@ -753,7 +753,7 @@ create table rtest_view1 (a int4, b text, v bool); create table rtest_view2 (a int4); create table rtest_view3 (a int4, b text); create table rtest_view4 (a int4, b text, c int4); -create view rtest_vview1 as select a, b from rtest_view1 X +create view rtest_vview1 as select a, b from rtest_view1 X where 0 < (select count(*) from rtest_view2 Y where Y.a = X.a); create view rtest_vview2 as select a, b from rtest_view1 where v; create view rtest_vview3 as select a, b from rtest_vview2 X @@ -896,7 +896,7 @@ create table rtest_unitfact ( unit char(4), factor float ); -create view rtest_vcomp as +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; @@ -1227,7 +1227,7 @@ create rule rrule as on update to vview do instead ( insert into cchild (pid, descrip) - select old.pid, new.descrip where old.descrip isnull; + select old.pid, new.descrip where old.descrip isnull; update cchild set descrip = new.descrip where cchild.pid = old.pid; ); select * from vview; @@ -1336,7 +1336,7 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem toyemp | SELECT emp.name, emp.age, emp.location, (12 * emp.salary) AS annualsal FROM emp; (56 rows) -SELECT tablename, rulename, definition FROM pg_rules +SELECT tablename, rulename, definition FROM pg_rules ORDER BY tablename, rulename; tablename | rulename | definition ---------------+-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -1394,14 +1394,12 @@ SELECT * FROM ruletest_tbl2; create table rule_and_refint_t1 ( id1a integer, id1b integer, - primary key (id1a, id1b) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t1_pkey" for table "rule_and_refint_t1" create table rule_and_refint_t2 ( id2a integer, id2c integer, - primary key (id2a, id2c) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t2_pkey" for table "rule_and_refint_t2" @@ -1517,11 +1515,11 @@ create temp table t1 (a integer primary key); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t1_pkey" for table "t1" create temp table t1_1 (check (a >= 0 and a < 10)) inherits (t1); create temp table t1_2 (check (a >= 10 and a < 20)) inherits (t1); -create rule t1_ins_1 as on insert to t1 +create rule t1_ins_1 as on insert to t1 where new.a >= 0 and new.a < 10 do instead insert into t1_1 values (new.a); -create rule t1_ins_2 as on insert to t1 +create rule t1_ins_2 as on insert to t1 where new.a >= 10 and new.a < 20 do instead insert into t1_2 values (new.a); diff --git a/src/test/regress/expected/select.out b/src/test/regress/expected/select.out index 449341739c..c376523bbe 100644 --- a/src/test/regress/expected/select.out +++ b/src/test/regress/expected/select.out @@ -25,7 +25,7 @@ SELECT * FROM onek -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using >; unique1 | stringu1 ---------+---------- @@ -55,7 +55,7 @@ SELECT onek.unique1, onek.stringu1 FROM onek -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY stringu1 using <; unique1 | stringu1 ---------+---------- @@ -80,13 +80,12 @@ SELECT onek.unique1, onek.stringu1 FROM onek 987 | ZLAAAA (19 rows) - -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1d -2 +0nr -1 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY string4 using <, unique1 using >; unique1 | string4 ---------+--------- @@ -111,7 +110,6 @@ SELECT onek.unique1, onek.string4 FROM onek 984 | VVVVxx (19 rows) - -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1dr -2 +0n -1 @@ -142,7 +140,6 @@ SELECT onek.unique1, onek.string4 FROM onek 999 | AAAAxx (19 rows) - -- -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0nr -1 +1d -2 @@ -179,7 +176,7 @@ SELECT onek.unique1, onek.string4 FROM onek -- sort +0n -1 +1dr -2 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using <, string4 using >; unique1 | string4 ---------+--------- @@ -238,7 +235,7 @@ SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10; -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek2.unique1, onek2.stringu1 FROM onek2 - WHERE onek2.unique1 < 20 + WHERE onek2.unique1 < 20 ORDER BY unique1 using >; unique1 | stringu1 ---------+---------- diff --git a/src/test/regress/expected/select_implicit.out b/src/test/regress/expected/select_implicit.out index 14fcd1c2b5..61b485fdaa 100644 --- a/src/test/regress/expected/select_implicit.out +++ b/src/test/regress/expected/select_implicit.out @@ -121,7 +121,7 @@ LINE 1: SELECT c, count(*) FROM test_missing_target GROUP BY 3; ^ -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; ERROR: column reference "b" is ambiguous @@ -177,7 +177,7 @@ SELECT a/2, a/2 FROM test_missing_target (5 rows) -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; b | count @@ -189,7 +189,7 @@ SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y (4 rows) -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; count @@ -202,8 +202,8 @@ SELECT count(*) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -291,14 +291,14 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; ERROR: column reference "b" is ambiguous LINE 3: GROUP BY b/2 ORDER BY b/2; ^ -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; ?column? | count @@ -310,7 +310,7 @@ SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; ERROR: column reference "b" is ambiguous @@ -318,8 +318,8 @@ LINE 1: SELECT count(b) FROM test_missing_target x, test_missing_tar... ^ -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/expected/select_implicit_1.out b/src/test/regress/expected/select_implicit_1.out index aee2da72b1..f277375ebf 100644 --- a/src/test/regress/expected/select_implicit_1.out +++ b/src/test/regress/expected/select_implicit_1.out @@ -121,7 +121,7 @@ LINE 1: SELECT c, count(*) FROM test_missing_target GROUP BY 3; ^ -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; ERROR: column reference "b" is ambiguous @@ -177,7 +177,7 @@ SELECT a/2, a/2 FROM test_missing_target (5 rows) -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; b | count @@ -189,7 +189,7 @@ SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y (4 rows) -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; count @@ -202,8 +202,8 @@ SELECT count(*) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -291,14 +291,14 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; ERROR: column reference "b" is ambiguous LINE 3: GROUP BY b/2 ORDER BY b/2; ^ -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; ?column? | count @@ -310,7 +310,7 @@ SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; ERROR: column reference "b" is ambiguous @@ -318,8 +318,8 @@ LINE 1: SELECT count(b) FROM test_missing_target x, test_missing_tar... ^ -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/expected/select_implicit_2.out b/src/test/regress/expected/select_implicit_2.out index 250f0fedb0..91c3a24f92 100644 --- a/src/test/regress/expected/select_implicit_2.out +++ b/src/test/regress/expected/select_implicit_2.out @@ -121,7 +121,7 @@ LINE 1: SELECT c, count(*) FROM test_missing_target GROUP BY 3; ^ -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; ERROR: column reference "b" is ambiguous @@ -177,7 +177,7 @@ SELECT a/2, a/2 FROM test_missing_target (5 rows) -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; b | count @@ -189,7 +189,7 @@ SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y (4 rows) -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; count @@ -202,8 +202,8 @@ SELECT count(*) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -291,14 +291,14 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; ERROR: column reference "b" is ambiguous LINE 3: GROUP BY b/2 ORDER BY b/2; ^ -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; ?column? | count @@ -310,7 +310,7 @@ SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; ERROR: column reference "b" is ambiguous @@ -318,8 +318,8 @@ LINE 1: SELECT count(b) FROM test_missing_target x, test_missing_tar... ^ -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/expected/sequence.out b/src/test/regress/expected/sequence.out index 823039ae95..19f8f1308d 100644 --- a/src/test/regress/expected/sequence.out +++ b/src/test/regress/expected/sequence.out @@ -1,16 +1,13 @@ --- --- test creation of SERIAL column --- - CREATE TABLE serialTest (f1 text, f2 serial); NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2" - INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('wrong', NULL); ERROR: null value in column "f2" violates not-null constraint - SELECT * FROM serialTest; f1 | f2 -------+----- @@ -21,7 +18,6 @@ SELECT * FROM serialTest; -- basic sequence operations using both text and oid references CREATE SEQUENCE sequence_test; - SELECT nextval('sequence_test'::text); nextval --------- diff --git a/src/test/regress/expected/sequence_1.out b/src/test/regress/expected/sequence_1.out index a97f499e75..ae928e9071 100644 --- a/src/test/regress/expected/sequence_1.out +++ b/src/test/regress/expected/sequence_1.out @@ -1,16 +1,13 @@ --- --- test creation of SERIAL column --- - CREATE TABLE serialTest (f1 text, f2 serial); NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2" - INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('wrong', NULL); ERROR: null value in column "f2" violates not-null constraint - SELECT * FROM serialTest; f1 | f2 -------+----- @@ -21,7 +18,6 @@ SELECT * FROM serialTest; -- basic sequence operations using both text and oid references CREATE SEQUENCE sequence_test; - SELECT nextval('sequence_test'::text); nextval --------- diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out index 7f8c05bc80..2440dcd822 100644 --- a/src/test/regress/expected/subselect.out +++ b/src/test/regress/expected/subselect.out @@ -297,7 +297,7 @@ SELECT *, ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status", (CASE WHEN ord.ordercancelled @@ -312,7 +312,7 @@ END) AS "Status", ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status_OK" FROM orderstest ord; SELECT * FROM orders_view; diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out index 6def970d80..ab8faab52e 100644 --- a/src/test/regress/expected/timestamp.out +++ b/src/test/regress/expected/timestamp.out @@ -180,7 +180,7 @@ INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 5097 BC'); ERROR: timestamp out of range: "Feb 16 17:32:01 5097 BC" LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 5097 BC')... ^ -SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; 64 | d1 ----+----------------------------- | -infinity @@ -804,7 +804,7 @@ SELECT '' AS "54", d1 as "timestamp", (55 rows) -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMP_TBL; to_char_1 | to_char -----------+------------------------------------------------------------------------------------------ @@ -1017,7 +1017,7 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') | 2,001 2001 001 01 1 21 1 01 01 001 01 2 2451911 (65 rows) -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') FROM TIMESTAMP_TBL; to_char_4 | to_char -----------+------------------------------------------------- @@ -1088,7 +1088,7 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM | 2,001 2001 1 1 1 21 1 1 1 1 1 2 2451911 (65 rows) -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') FROM TIMESTAMP_TBL; to_char_5 | to_char -----------+---------------------- @@ -1159,7 +1159,7 @@ SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') | 05 05 17 32 01 63121 (65 rows) -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') FROM TIMESTAMP_TBL; to_char_6 | to_char -----------+------------------------------------------------- @@ -1301,7 +1301,7 @@ SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') | 17--text--32--text--01 (65 rows) -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') FROM TIMESTAMP_TBL; to_char_8 | to_char -----------+------------------------- @@ -1372,9 +1372,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') | 2001ST 2001st 2451911th (65 rows) - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMP_TBL; +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') + FROM TIMESTAMP_TBL; to_char_9 | to_char -----------+--------------------------------------------------------------------- | diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out index 47e3394792..9a4ce3e336 100644 --- a/src/test/regress/expected/timestamptz.out +++ b/src/test/regress/expected/timestamptz.out @@ -251,7 +251,7 @@ SELECT 'Wed Jul 11 10:51:14 PST+03:00 2001'::timestamptz; Wed Jul 11 06:51:14 2001 PDT (1 row) -SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; 64 | d1 ----+--------------------------------- | -infinity @@ -883,7 +883,7 @@ SELECT '' AS "54", d1 as timestamptz, (56 rows) -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMPTZ_TBL; to_char_1 | to_char -----------+------------------------------------------------------------------------------------------ @@ -955,9 +955,8 @@ SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM M | MONDAY Monday monday MON Mon mon JANUARY January january I JAN Jan jan (66 rows) - SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; to_char_2 | to_char -----------+-------------------------------------------------------------- | @@ -1100,9 +1099,8 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') | 2,001 2001 001 01 1 21 1 01 01 001 01 2 2451911 (66 rows) - -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') - FROM TIMESTAMPTZ_TBL; +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') + FROM TIMESTAMPTZ_TBL; to_char_4 | to_char -----------+------------------------------------------------- | @@ -1173,8 +1171,7 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM | 2,001 2001 1 1 1 21 1 1 1 1 1 2 2451911 (66 rows) - -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') FROM TIMESTAMPTZ_TBL; to_char_5 | to_char -----------+---------------------- @@ -1246,8 +1243,8 @@ SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') | 05 05 17 32 01 63121 (66 rows) -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') - FROM TIMESTAMPTZ_TBL; +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') + FROM TIMESTAMPTZ_TBL; to_char_6 | to_char -----------+------------------------------------------------- | @@ -1318,9 +1315,8 @@ SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between qu | HH:MI:SS is 05:32:01 "text between quote marks" (66 rows) - SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; to_char_7 | to_char -----------+------------------------ | @@ -1391,7 +1387,7 @@ SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') | 17--text--32--text--01 (66 rows) -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') FROM TIMESTAMPTZ_TBL; to_char_8 | to_char -----------+------------------------- @@ -1463,9 +1459,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') | 2001ST 2001st 2451911th (66 rows) - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMPTZ_TBL; +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') + FROM TIMESTAMPTZ_TBL; to_char_9 | to_char -----------+--------------------------------------------------------------------- | diff --git a/src/test/regress/expected/tinterval.out b/src/test/regress/expected/tinterval.out index 89e850cf61..a0189729fc 100644 --- a/src/test/regress/expected/tinterval.out +++ b/src/test/regress/expected/tinterval.out @@ -14,7 +14,7 @@ INSERT INTO TINTERVAL_TBL (f1) VALUES ('["epoch" "Mon May 1 00:30:30 1995"]'); INSERT INTO TINTERVAL_TBL (f1) VALUES ('["Feb 15 1990 12:15:03" "2001-09-23 11:12:13"]'); --- badly formatted tintervals +-- badly formatted tintervals INSERT INTO TINTERVAL_TBL (f1) VALUES ('["bad time specifications" ""]'); ERROR: invalid input syntax for type abstime: "bad time specifications" @@ -146,7 +146,7 @@ SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2 -- contains SELECT '' AS five, t1.f1 FROM TINTERVAL_TBL t1 - WHERE not t1.f1 << + WHERE not t1.f1 << tinterval '["Aug 15 14:23:19 1980" "Sep 16 14:23:19 1990"]' ORDER BY t1.f1; five | f1 diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out index c4f8965fd1..84d14537f1 100644 --- a/src/test/regress/expected/transactions.out +++ b/src/test/regress/expected/transactions.out @@ -2,7 +2,7 @@ -- TRANSACTIONS -- BEGIN; -SELECT * +SELECT * INTO TABLE xacttest FROM aggtest; INSERT INTO xacttest (a, b) VALUES (777, 777.777); @@ -24,13 +24,13 @@ SELECT * FROM aggtest; (0 rows) ABORT; --- should not exist +-- should not exist SELECT oid FROM pg_class WHERE relname = 'disappear'; oid ----- (0 rows) --- should have members again +-- should have members again SELECT * FROM aggtest; a | b -----+--------- @@ -179,7 +179,6 @@ BEGIN; ROLLBACK; COMMIT; -- should not be in a transaction block WARNING: there is no transaction in progress - SELECT * FROM savepoints; a --- diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index 1b9cdd4375..c9e8c1a141 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -19,23 +19,23 @@ create unique index pkeys_i on pkeys (pkey1, pkey2); -- (fkey1, fkey2) --> pkeys (pkey1, pkey2) -- (fkey3) --> fkeys2 (pkey23) -- -create trigger check_fkeys_pkey_exist - before insert or update on fkeys - for each row - execute procedure +create trigger check_fkeys_pkey_exist + before insert or update on fkeys + for each row + execute procedure check_primary_key ('fkey1', 'fkey2', 'pkeys', 'pkey1', 'pkey2'); -create trigger check_fkeys_pkey2_exist - before insert or update on fkeys - for each row +create trigger check_fkeys_pkey2_exist + before insert or update on fkeys + for each row execute procedure check_primary_key ('fkey3', 'fkeys2', 'pkey23'); -- -- For fkeys2: -- (fkey21, fkey22) --> pkeys (pkey1, pkey2) -- -create trigger check_fkeys2_pkey_exist - before insert or update on fkeys2 - for each row - execute procedure +create trigger check_fkeys2_pkey_exist + before insert or update on fkeys2 + for each row + execute procedure check_primary_key ('fkey21', 'fkey22', 'pkeys', 'pkey1', 'pkey2'); -- Test comments COMMENT ON TRIGGER check_fkeys2_pkey_bad ON fkeys2 IS 'wrong'; @@ -48,19 +48,19 @@ COMMENT ON TRIGGER check_fkeys2_pkey_exist ON fkeys2 IS NULL; -- fkeys (fkey1, fkey2) and fkeys2 (fkey21, fkey22) -- create trigger check_pkeys_fkey_cascade - before delete or update on pkeys - for each row - execute procedure - check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', + before delete or update on pkeys + for each row + execute procedure + check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', 'fkeys', 'fkey1', 'fkey2', 'fkeys2', 'fkey21', 'fkey22'); -- -- For fkeys2: -- ON DELETE/UPDATE (pkey23) RESTRICT: -- fkeys (fkey3) -- -create trigger check_fkeys2_fkey_restrict +create trigger check_fkeys2_fkey_restrict before delete or update on fkeys2 - for each row + for each row execute procedure check_foreign_key (1, 'restrict', 'pkey23', 'fkeys', 'fkey3'); insert into fkeys2 values (10, '1', 1); insert into fkeys2 values (30, '3', 2); @@ -106,49 +106,49 @@ DROP TABLE fkeys2; -- -- Jan -- -- create table dup17 (x int4); --- --- create trigger dup17_before +-- +-- create trigger dup17_before -- before insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; --- +-- -- insert into dup17 values (17); -- select count(*) from dup17; -- insert into dup17 values (17); -- select count(*) from dup17; --- +-- -- drop trigger dup17_before on dup17; --- +-- -- create trigger dup17_after -- after insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; --- +-- -- DROP TABLE dup17; create sequence ttdummy_seq increment 10 start 0 minvalue 0; create table tttest ( - price_id int4, - price_val int4, + price_id int4, + price_val int4, price_on int4, price_off int4 default 999999 ); -create trigger ttdummy +create trigger ttdummy before delete or update on tttest - for each row - execute procedure + for each row + execute procedure ttdummy (price_on, price_off); -create trigger ttserial +create trigger ttserial before insert or update on tttest - for each row - execute procedure + for each row + execute procedure autoinc (price_on, ttdummy_seq); insert into tttest values (1, 1, null); insert into tttest values (2, 2, null); @@ -567,7 +567,7 @@ CREATE TABLE trigger_test ( i int, v varchar ); -CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger +CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger LANGUAGE plpgsql AS $$ declare @@ -580,7 +580,7 @@ begin relid := TG_relid::regclass; -- plpgsql can't discover its trigger data in a hash like perl and python - -- can, or by a sort of reflection like tcl can, + -- can, or by a sort of reflection like tcl can, -- so we have to hard code the names. raise NOTICE 'TG_NAME: %', TG_name; raise NOTICE 'TG_WHEN: %', TG_when; @@ -618,7 +618,7 @@ begin end; $$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); insert into trigger_test values(1,'insert'); @@ -658,9 +658,7 @@ NOTICE: TG_TABLE_SCHEMA: public NOTICE: TG_NARGS: 2 NOTICE: TG_ARGV: [23, skidoo] NOTICE: OLD: (1,update) - DROP TRIGGER show_trigger_data_trig on trigger_test; - DROP FUNCTION trigger_data(); DROP TABLE trigger_test; -- @@ -755,10 +753,10 @@ CREATE TABLE min_updates_test_oids ( f3 int) WITH OIDS; INSERT INTO min_updates_test VALUES ('a',1,2),('b','2',null); INSERT INTO min_updates_test_oids VALUES ('a',1,2),('b','2',null); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test_oids FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); \set QUIET false diff --git a/src/test/regress/expected/truncate.out b/src/test/regress/expected/truncate.out index 6e190fd5f6..1817bac8e3 100644 --- a/src/test/regress/expected/truncate.out +++ b/src/test/regress/expected/truncate.out @@ -302,7 +302,7 @@ $$ LANGUAGE plpgsql; INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER t BEFORE TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('before trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; Row count in test table @@ -334,7 +334,7 @@ truncate trunc_trigger_log; INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER tt AFTER TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('after trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; Row count in test table diff --git a/src/test/regress/expected/tsdicts.out b/src/test/regress/expected/tsdicts.out index aba67fcab7..9df1434a14 100644 --- a/src/test/regress/expected/tsdicts.out +++ b/src/test/regress/expected/tsdicts.out @@ -193,7 +193,7 @@ SELECT ts_lexize('hunspell', 'footballyklubber'); -- Synonim dictionary CREATE TEXT SEARCH DICTIONARY synonym ( - Template=synonym, + Template=synonym, Synonyms=synonym_sample ); SELECT ts_lexize('synonym', 'PoStGrEs'); @@ -219,7 +219,7 @@ SELECT ts_lexize('synonym', 'indices'); -- cannot pass more than one word to thesaurus. CREATE TEXT SEARCH DICTIONARY thesaurus ( Template=thesaurus, - DictFile=thesaurus_sample, + DictFile=thesaurus_sample, Dictionary=english_stem ); SELECT ts_lexize('thesaurus', 'one'); @@ -281,8 +281,8 @@ SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky'); CREATE TEXT SEARCH CONFIGURATION synonym_tst ( COPY=english ); -ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, english_stem; SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre'); to_tsvector @@ -313,8 +313,8 @@ SELECT to_tsquery('synonym_tst', 'Index & indices'); CREATE TEXT SEARCH CONFIGURATION thesaurus_tst ( COPY=synonym_tst ); -ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, thesaurus, english_stem; SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one'); to_tsvector diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out index 86ea5efc7b..e1d7646c0d 100644 --- a/src/test/regress/expected/tsearch.out +++ b/src/test/regress/expected/tsearch.out @@ -46,7 +46,7 @@ WHERE mapcfg = 0 OR mapdict = 0; -- Look for pg_ts_config_map entries that aren't one of parser's token types SELECT * FROM ( SELECT oid AS cfgid, (ts_token_type(cfgparser)).tokid AS tokid - FROM pg_ts_config ) AS tt + FROM pg_ts_config ) AS tt RIGHT JOIN pg_ts_config_map AS m ON (tt.cfgid=m.mapcfg AND tt.tokid=m.maptokentype) WHERE @@ -188,7 +188,6 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*'; 494 (1 row) - RESET enable_seqscan; INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH'); SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10; @@ -672,7 +671,7 @@ to_tsquery('english', 'sea&foo'), 'HighlightAll=true'); </html> (1 row) ---Check if headline fragments work +--Check if headline fragments work SELECT ts_headline('english', ' Day after day, day after day, We stuck, nor breath nor motion, diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out index b7433653d1..556672d408 100644 --- a/src/test/regress/expected/type_sanity.out +++ b/src/test/regress/expected/type_sanity.out @@ -72,7 +72,7 @@ WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS (3 rows) -- Make sure typarray points to a varlena array type of our own base -SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, +SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, p2.typelem, p2.typlen FROM pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid) WHERE p1.typarray <> 0 AND diff --git a/src/test/regress/expected/varchar.out b/src/test/regress/expected/varchar.out index 48a77f5e13..e1120234ac 100644 --- a/src/test/regress/expected/varchar.out +++ b/src/test/regress/expected/varchar.out @@ -4,13 +4,13 @@ CREATE TABLE VARCHAR_TBL(f1 varchar(1)); INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/varchar_1.out b/src/test/regress/expected/varchar_1.out index d726e4cc43..35f6180d48 100644 --- a/src/test/regress/expected/varchar_1.out +++ b/src/test/regress/expected/varchar_1.out @@ -4,13 +4,13 @@ CREATE TABLE VARCHAR_TBL(f1 varchar(1)); INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/varchar_2.out b/src/test/regress/expected/varchar_2.out index 79c4782462..49add1f621 100644 --- a/src/test/regress/expected/varchar_2.out +++ b/src/test/regress/expected/varchar_2.out @@ -4,13 +4,13 @@ CREATE TABLE VARCHAR_TBL(f1 varchar(1)); INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out index 0481cc6dd8..aa0a0c2067 100644 --- a/src/test/regress/expected/window.out +++ b/src/test/regress/expected/window.out @@ -361,7 +361,7 @@ SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM te (10 rows) -- last_value returns the last row of the frame, which is CURRENT ROW in ORDER BY window. -SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; +SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; last_value | ten | four ------------+-----+------ 0 | 0 | 0 @@ -409,7 +409,7 @@ SELECT nth_value(ten, four + 1) OVER (PARTITION BY four), ten, four | 3 | 3 (10 rows) -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum FROM tenk1 GROUP BY ten, two; ten | two | gsum | wsum -----+-----+-------+-------- @@ -436,8 +436,8 @@ SELECT count(*) OVER (PARTITION BY four), four FROM (SELECT * FROM tenk1 WHERE t 2 | 3 (6 rows) -SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum +SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum FROM tenk1 WHERE unique2 < 10; cntsum -------- @@ -455,8 +455,8 @@ SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + -- opexpr with different windows evaluation. SELECT * FROM( - SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, + SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, count(*) OVER (PARTITION BY four ORDER BY ten) AS fourcount, sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS twosum FROM tenk1 @@ -481,7 +481,7 @@ SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) FROM tenk1 WHE 3.0000000000000000 (10 rows) -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum FROM tenk1 GROUP BY ten, two WINDOW win AS (PARTITION BY two ORDER BY ten); ten | two | gsum | wsum -----+-----+-------+-------- diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source index 2d34c72b6c..ab3f5083e8 100644 --- a/src/test/regress/input/copy.source +++ b/src/test/regress/input/copy.source @@ -95,8 +95,8 @@ select * from copytest except select * from copytest2; -- test header line feature create temp table copytest3 ( - c1 int, - "col with , comma" text, + c1 int, + "col with , comma" text, "col with "" quote" int); copy copytest3 from stdin csv header; diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source index 459ca3c0a3..6aed5f008b 100644 --- a/src/test/regress/input/create_function_2.source +++ b/src/test/regress/input/create_function_2.source @@ -2,7 +2,7 @@ -- CREATE_FUNCTION_2 -- CREATE FUNCTION hobbies(person) - RETURNS setof hobbies_r + RETURNS setof hobbies_r AS 'select * from hobbies_r where person = $1.name' LANGUAGE SQL; @@ -27,7 +27,7 @@ CREATE FUNCTION equipment(hobbies_r) CREATE FUNCTION user_relns() RETURNS setof name - AS 'select relname + AS 'select relname from pg_class c, pg_namespace n where relnamespace = n.oid and (nspname !~ ''pg_.*'' and nspname <> ''information_schema'') and diff --git a/src/test/regress/input/misc.source b/src/test/regress/input/misc.source index fa58b54564..0930a6a4bb 100644 --- a/src/test/regress/input/misc.source +++ b/src/test/regress/input/misc.source @@ -17,16 +17,16 @@ UPDATE onek -- UPDATE onek2 -- SET unique1 = onek2.unique1 + 1; ---UPDATE onek2 +--UPDATE onek2 -- SET unique1 = onek2.unique1 - 1; -- -- BTREE shutting out non-functional updates -- --- the following two tests seem to take a long time on some +-- the following two tests seem to take a long time on some -- systems. This non-func update stuff needs to be examined -- more closely. - jolly (2/22/96) --- +-- UPDATE tmp SET stringu1 = reverse_name(onek.stringu1) FROM onek @@ -87,12 +87,12 @@ SELECT * FROM stud_emp; -- SELECT * FROM a_star*; -SELECT * +SELECT * FROM b_star* x WHERE x.b = text 'bumble' or x.a < 3; -SELECT class, a - FROM c_star* x +SELECT class, a + FROM c_star* x WHERE x.c ~ text 'hi'; SELECT class, b, c @@ -137,7 +137,7 @@ SELECT class, foo ALTER TABLE a_star RENAME COLUMN foo TO aa; -SELECT * +SELECT * from a_star* WHERE aa < 1000; diff --git a/src/test/regress/output/copy.source b/src/test/regress/output/copy.source index 5a88d6ef20..febca712bb 100644 --- a/src/test/regress/output/copy.source +++ b/src/test/regress/output/copy.source @@ -63,8 +63,8 @@ select * from copytest except select * from copytest2; -- test header line feature create temp table copytest3 ( - c1 int, - "col with , comma" text, + c1 int, + "col with , comma" text, "col with "" quote" int); copy copytest3 from stdin csv header; copy copytest3 to stdout csv header; diff --git a/src/test/regress/output/create_function_2.source b/src/test/regress/output/create_function_2.source index 0feb975355..94ab7eba56 100644 --- a/src/test/regress/output/create_function_2.source +++ b/src/test/regress/output/create_function_2.source @@ -2,7 +2,7 @@ -- CREATE_FUNCTION_2 -- CREATE FUNCTION hobbies(person) - RETURNS setof hobbies_r + RETURNS setof hobbies_r AS 'select * from hobbies_r where person = $1.name' LANGUAGE SQL; CREATE FUNCTION hobby_construct(text, text) @@ -21,7 +21,7 @@ CREATE FUNCTION equipment(hobbies_r) LANGUAGE SQL; CREATE FUNCTION user_relns() RETURNS setof name - AS 'select relname + AS 'select relname from pg_class c, pg_namespace n where relnamespace = n.oid and (nspname !~ ''pg_.*'' and nspname <> ''information_schema'') and diff --git a/src/test/regress/output/misc.source b/src/test/regress/output/misc.source index 0effa4b853..c225d0f37f 100644 --- a/src/test/regress/output/misc.source +++ b/src/test/regress/output/misc.source @@ -13,15 +13,15 @@ UPDATE onek -- -- UPDATE onek2 -- SET unique1 = onek2.unique1 + 1; ---UPDATE onek2 +--UPDATE onek2 -- SET unique1 = onek2.unique1 - 1; -- -- BTREE shutting out non-functional updates -- --- the following two tests seem to take a long time on some +-- the following two tests seem to take a long time on some -- systems. This non-func update stuff needs to be examined -- more closely. - jolly (2/22/96) --- +-- UPDATE tmp SET stringu1 = reverse_name(onek.stringu1) FROM onek @@ -136,7 +136,7 @@ SELECT * FROM a_star*; f | (50 rows) -SELECT * +SELECT * FROM b_star* x WHERE x.b = text 'bumble' or x.a < 3; class | a | b @@ -144,8 +144,8 @@ SELECT * b | | bumble (1 row) -SELECT class, a - FROM c_star* x +SELECT class, a + FROM c_star* x WHERE x.c ~ text 'hi'; class | a -------+---- @@ -309,7 +309,7 @@ SELECT class, foo (25 rows) ALTER TABLE a_star RENAME COLUMN foo TO aa; -SELECT * +SELECT * from a_star* WHERE aa < 1000; class | aa diff --git a/src/test/regress/sql/abstime.sql b/src/test/regress/sql/abstime.sql index cbaeb62957..4ab821b1b8 100644 --- a/src/test/regress/sql/abstime.sql +++ b/src/test/regress/sql/abstime.sql @@ -6,7 +6,7 @@ -- -- timezones may vary based not only on location but the operating --- system. the main correctness issue is that the OS may not get +-- system. the main correctness issue is that the OS may not get -- daylight savings time right for times prior to Unix epoch (jan 1 1970). -- @@ -27,11 +27,11 @@ INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime '-infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'May 10, 1947 23:59:12'); --- what happens if we specify slightly misformatted abstime? +-- what happens if we specify slightly misformatted abstime? INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'); INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'); --- badly formatted abstimes: these should result in invalid abstimes +-- badly formatted abstimes: these should result in invalid abstimes INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843'); diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql index 3825d7b302..232649937a 100644 --- a/src/test/regress/sql/aggregates.sql +++ b/src/test/regress/sql/aggregates.sql @@ -99,7 +99,7 @@ CREATE TEMPORARY TABLE bitwise_test( ); -- empty case -SELECT +SELECT BIT_AND(i2) AS "?", BIT_OR(i4) AS "?" FROM bitwise_test; @@ -159,7 +159,7 @@ SELECT boolor_statefunc(FALSE, TRUE) AS "t", NOT boolor_statefunc(FALSE, FALSE) AS "t"; -CREATE TEMPORARY TABLE bool_test( +CREATE TEMPORARY TABLE bool_test( b1 BOOL, b2 BOOL, b3 BOOL, diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 3e1646a96d..c6015cbb40 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -62,8 +62,8 @@ ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -73,7 +73,7 @@ SELECT * FROM tmp; DROP TABLE tmp; --- the wolf bug - schema mods caused inconsistent row descriptors +-- the wolf bug - schema mods caused inconsistent row descriptors CREATE TABLE tmp ( initial int4 ); @@ -131,8 +131,8 @@ ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -176,7 +176,7 @@ ALTER TABLE tmp_view RENAME TO tmp_view_new; ANALYZE tenk1; set enable_seqscan to off; set enable_bitmapscan to off; --- 5 values, sorted +-- 5 values, sorted SELECT unique1 FROM tenk1 WHERE unique1 < 5; reset enable_seqscan; reset enable_bitmapscan; @@ -1053,7 +1053,7 @@ insert into anothertab (atcol1, atcol2) values (default, null); select * from anothertab; alter table anothertab alter column atcol2 type text - using case when atcol2 is true then 'IT WAS TRUE' + using case when atcol2 is true then 'IT WAS TRUE' when atcol2 is false then 'IT WAS FALSE' else 'IT WAS NULL!' end; diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql index a75b8c4d2d..b0c096d9e5 100644 --- a/src/test/regress/sql/arrays.sql +++ b/src/test/regress/sql/arrays.sql @@ -6,7 +6,7 @@ CREATE TABLE arrtest ( a int2[], b int4[][][], c name[], - d text[][], + d text[][], e float8[], f char(5)[], g varchar(5)[] @@ -27,7 +27,7 @@ INSERT INTO arrtest (f) VALUES ('{"too long"}'); INSERT INTO arrtest (a, b[1:2][1:2], c, d, e, f, g) - VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', + VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', '{{"elt1", "elt2"}}', '{"3.4", "6.7"}', '{"abc","abcde"}', '{"abc","abcde"}'); @@ -40,7 +40,7 @@ SELECT * FROM arrtest; SELECT arrtest.a[1], arrtest.b[1][1][1], arrtest.c[1], - arrtest.d[1][1], + arrtest.d[1][1], arrtest.e[0] FROM arrtest; @@ -49,7 +49,7 @@ SELECT a[1], b[1][1][1], c[1], d[1][1], e[0] SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][1:2] FROM arrtest; @@ -59,10 +59,10 @@ SELECT array_ndims(a) AS a,array_ndims(b) AS b,array_ndims(c) AS c SELECT array_dims(a) AS a,array_dims(b) AS b,array_dims(c) AS c FROM arrtest; --- returns nothing +-- returns nothing SELECT * FROM arrtest - WHERE a[1] < 5 and + WHERE a[1] < 5 and c = '{"foobar"}'::_name; UPDATE arrtest @@ -82,7 +82,7 @@ SELECT a,b,c FROM arrtest; SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][2:2] FROM arrtest; @@ -346,12 +346,12 @@ drop type _comptype; drop table comptable; drop type comptype; -create or replace function unnest1(anyarray) +create or replace function unnest1(anyarray) returns setof anyelement as $$ select $1[s] from generate_subscripts($1,1) g(s); $$ language sql immutable; -create or replace function unnest2(anyarray) +create or replace function unnest2(anyarray) returns setof anyelement as $$ select $1[s1][s2] from generate_subscripts($1,1) g1(s1), generate_subscripts($1,2) g2(s2); diff --git a/src/test/regress/sql/bit.sql b/src/test/regress/sql/bit.sql index 73ddd379c0..419d47c8b7 100644 --- a/src/test/regress/sql/bit.sql +++ b/src/test/regress/sql/bit.sql @@ -16,7 +16,7 @@ INSERT INTO BIT_TABLE VALUES (B'101011111010'); -- too long --INSERT INTO BIT_TABLE VALUES ('X554'); --INSERT INTO BIT_TABLE VALUES ('X555'); -SELECT * FROM BIT_TABLE; +SELECT * FROM BIT_TABLE; CREATE TABLE VARBIT_TABLE(v BIT VARYING(11)); @@ -27,12 +27,12 @@ INSERT INTO VARBIT_TABLE VALUES (B'01010101010'); INSERT INTO VARBIT_TABLE VALUES (B'101011111010'); -- too long --INSERT INTO VARBIT_TABLE VALUES ('X554'); --INSERT INTO VARBIT_TABLE VALUES ('X555'); -SELECT * FROM VARBIT_TABLE; +SELECT * FROM VARBIT_TABLE; -- Concatenation SELECT v, b, (v || b) AS concat - FROM BIT_TABLE, VARBIT_TABLE + FROM BIT_TABLE, VARBIT_TABLE ORDER BY 3; -- Length @@ -69,7 +69,7 @@ XFA50 X05AF X1234 XFFF5 \. -SELECT a, b, ~a AS "~ a", a & b AS "a & b", +SELECT a, b, ~a AS "~ a", a & b AS "a & b", a | b AS "a | b", a # b AS "a # b" FROM varbit_table; SELECT a,b,a<b AS "a<b",a<=b AS "a<=b",a=b AS "a=b", a>=b AS "a>=b",a>b AS "a>b",a<>b AS "a<>b" FROM varbit_table; @@ -93,7 +93,7 @@ XFA50 X05AF X1234 XFFF5 \. -SELECT a,b,~a AS "~ a",a & b AS "a & b", +SELECT a,b,~a AS "~ a",a & b AS "a & b", a|b AS "a | b", a # b AS "a # b" FROM bit_table; SELECT a,b,a<b AS "a<b",a<=b AS "a<=b",a=b AS "a=b", a>=b AS "a>=b",a>b AS "a>b",a<>b AS "a<>b" FROM bit_table; @@ -166,7 +166,7 @@ INSERT INTO BIT_SHIFT_TABLE SELECT b>>4 FROM BIT_SHIFT_TABLE; INSERT INTO BIT_SHIFT_TABLE SELECT b>>8 FROM BIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN b), POSITION(B'11011' IN b), - b + b FROM BIT_SHIFT_TABLE ; @@ -178,7 +178,7 @@ INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'0000' AS BIT VARYING(12)) >>4 INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'00000000' AS BIT VARYING(20)) >>8 FROM VARBIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN v), POSITION(B'11011' IN v), - v + v FROM VARBIT_SHIFT_TABLE ; diff --git a/src/test/regress/sql/bitmapops.sql b/src/test/regress/sql/bitmapops.sql index 0b5477e8e1..498f4721b5 100644 --- a/src/test/regress/sql/bitmapops.sql +++ b/src/test/regress/sql/bitmapops.sql @@ -14,7 +14,7 @@ CREATE TABLE bmscantest (a int, b int, t text); -INSERT INTO bmscantest +INSERT INTO bmscantest SELECT (r%53), (r%59), 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo' FROM generate_series(1,70000) r; diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql index a605302e12..d92a41ffe1 100644 --- a/src/test/regress/sql/boolean.sql +++ b/src/test/regress/sql/boolean.sql @@ -100,7 +100,7 @@ INSERT INTO BOOLTBL1 (f1) VALUES (bool 'True'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'true'); --- BOOLTBL1 should be full of true's at this point +-- BOOLTBL1 should be full of true's at this point SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1; @@ -109,7 +109,7 @@ SELECT '' AS t_3, BOOLTBL1.* WHERE f1 = bool 'true'; -SELECT '' AS t_3, BOOLTBL1.* +SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 <> bool 'false'; @@ -119,7 +119,7 @@ SELECT '' AS zero, BOOLTBL1.* INSERT INTO BOOLTBL1 (f1) VALUES (bool 'f'); -SELECT '' AS f_1, BOOLTBL1.* +SELECT '' AS f_1, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 = bool 'false'; @@ -136,10 +136,10 @@ INSERT INTO BOOLTBL2 (f1) VALUES (bool 'FALSE'); -- This is now an invalid expression -- For pre-v6.3 this evaluated to false - thomas 1997-10-23 -INSERT INTO BOOLTBL2 (f1) - VALUES (bool 'XXX'); +INSERT INTO BOOLTBL2 (f1) + VALUES (bool 'XXX'); --- BOOLTBL2 should be full of false's at this point +-- BOOLTBL2 should be full of false's at this point SELECT '' AS f_4, BOOLTBL2.* FROM BOOLTBL2; diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql index f1ff8158b0..234c2f28a3 100644 --- a/src/test/regress/sql/box.sql +++ b/src/test/regress/sql/box.sql @@ -25,13 +25,13 @@ INSERT INTO BOX_TBL (f1) VALUES ('(2.0,2.0,0.0,0.0)'); INSERT INTO BOX_TBL (f1) VALUES ('(1.0,1.0,3.0,3.0)'); --- degenerate cases where the box is a line or a point --- note that lines and points boxes all have zero area +-- degenerate cases where the box is a line or a point +-- note that lines and points boxes all have zero area INSERT INTO BOX_TBL (f1) VALUES ('(2.5, 2.5, 2.5,3.5)'); INSERT INTO BOX_TBL (f1) VALUES ('(3.0, 3.0,3.0,3.0)'); --- badly formatted box inputs +-- badly formatted box inputs INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad'); @@ -42,78 +42,78 @@ SELECT '' AS four, * FROM BOX_TBL; SELECT '' AS four, b.*, area(b.f1) as barea FROM BOX_TBL b; --- overlap +-- overlap SELECT '' AS three, b.f1 - FROM BOX_TBL b + FROM BOX_TBL b WHERE b.f1 && box '(2.5,2.5,1.0,1.0)'; --- left-or-overlap (x only) +-- left-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &< box '(2.0,2.0,2.5,2.5)'; --- right-or-overlap (x only) +-- right-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &> box '(2.0,2.0,2.5,2.5)'; --- left of +-- left of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 << box '(3.0,3.0,5.0,5.0)'; --- area <= +-- area <= SELECT '' AS four, b.f1 FROM BOX_TBL b WHERE b.f1 <= box '(3.0,3.0,5.0,5.0)'; --- area < +-- area < SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 < box '(3.0,3.0,5.0,5.0)'; --- area = +-- area = SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 = box '(3.0,3.0,5.0,5.0)'; --- area > +-- area > SELECT '' AS two, b.f1 - FROM BOX_TBL b -- zero area - WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; + FROM BOX_TBL b -- zero area + WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; --- area >= +-- area >= SELECT '' AS four, b.f1 - FROM BOX_TBL b -- zero area + FROM BOX_TBL b -- zero area WHERE b.f1 >= box '(3.5,3.0,4.5,3.0)'; --- right of +-- right of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE box '(3.0,3.0,5.0,5.0)' >> b.f1; --- contained in +-- contained in SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE b.f1 <@ box '(0,0,3,3)'; --- contains +-- contains SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE box '(0,0,3,3)' @> b.f1; --- box equality +-- box equality SELECT '' AS one, b.f1 FROM BOX_TBL b WHERE box '(1,1,3,3)' ~= b.f1; --- center of box, left unary operator +-- center of box, left unary operator SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL b1; --- wholly-contained +-- wholly-contained SELECT '' AS one, b1.*, b2.* - FROM BOX_TBL b1, BOX_TBL b2 + FROM BOX_TBL b1, BOX_TBL b2 WHERE b1.f1 @> b2.f1 and not b1.f1 ~= b2.f1; SELECT '' AS four, height(f1), width(f1) FROM BOX_TBL; diff --git a/src/test/regress/sql/char.sql b/src/test/regress/sql/char.sql index fcaef7e086..235ec62823 100644 --- a/src/test/regress/sql/char.sql +++ b/src/test/regress/sql/char.sql @@ -17,17 +17,17 @@ INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql index 3dea2e4b29..8d536c8c36 100644 --- a/src/test/regress/sql/cluster.sql +++ b/src/test/regress/sql/cluster.sql @@ -174,7 +174,7 @@ UPDATE clustertest SET key = 100 WHERE key = 10; -- Test update where the new row version is found first in the scan UPDATE clustertest SET key = 35 WHERE key = 40; --- Test longer update chain +-- Test longer update chain UPDATE clustertest SET key = 60 WHERE key = 50; UPDATE clustertest SET key = 70 WHERE key = 60; UPDATE clustertest SET key = 80 WHERE key = 70; diff --git a/src/test/regress/sql/copyselect.sql b/src/test/regress/sql/copyselect.sql index beca507ae7..621d49444d 100644 --- a/src/test/regress/sql/copyselect.sql +++ b/src/test/regress/sql/copyselect.sql @@ -70,7 +70,7 @@ copy (select t from test1 where id = 1) to stdout csv header force quote t; -- This should fail -- \copy v_test1 to stdout --- +-- -- Test \copy (select ...) -- \copy (select "id",'id','id""'||t,(id + 1)*id,t,"test1"."t" from test1 where id=3) to stdout diff --git a/src/test/regress/sql/create_aggregate.sql b/src/test/regress/sql/create_aggregate.sql index 6174248252..84f9a4f1e0 100644 --- a/src/test/regress/sql/create_aggregate.sql +++ b/src/test/regress/sql/create_aggregate.sql @@ -4,7 +4,7 @@ -- all functions CREATEd CREATE AGGREGATE newavg ( - sfunc = int4_avg_accum, basetype = int4, stype = _int8, + sfunc = int4_avg_accum, basetype = int4, stype = _int8, finalfunc = int8_avg, initcond1 = '{0,0}' ); @@ -16,7 +16,7 @@ COMMENT ON AGGREGATE newavg (int4) IS NULL; -- without finalfunc; test obsolete spellings 'sfunc1' etc CREATE AGGREGATE newsum ( - sfunc1 = int4pl, basetype = int4, stype1 = int4, + sfunc1 = int4pl, basetype = int4, stype1 = int4, initcond1 = '0' ); diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql index a4261c0f5e..abf222de8e 100644 --- a/src/test/regress/sql/create_index.sql +++ b/src/test/regress/sql/create_index.sql @@ -80,8 +80,8 @@ CREATE INDEX gpointind ON point_tbl USING gist (f1); CREATE TEMP TABLE gpolygon_tbl AS SELECT polygon(home_base) AS f1 FROM slow_emp4000; -INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); -INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); CREATE TEMP TABLE gcircle_tbl AS SELECT circle(home_base) AS f1 FROM slow_emp4000; @@ -424,5 +424,5 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL RESET enable_seqscan; RESET enable_indexscan; RESET enable_bitmapscan; - + DROP TABLE onek_with_null; diff --git a/src/test/regress/sql/create_misc.sql b/src/test/regress/sql/create_misc.sql index 40c9b417d9..705a7e55b1 100644 --- a/src/test/regress/sql/create_misc.sql +++ b/src/test/regress/sql/create_misc.sql @@ -42,14 +42,14 @@ SELECT * FROM road WHERE name ~ '.*Ramp'; -INSERT INTO ihighway - SELECT * - FROM road +INSERT INTO ihighway + SELECT * + FROM road WHERE name ~ 'I- .*'; -INSERT INTO shighway - SELECT * - FROM road +INSERT INTO shighway + SELECT * + FROM road WHERE name ~ 'State Hwy.*'; UPDATE shighway @@ -154,7 +154,7 @@ INSERT INTO f_star (class, a, e, f) VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); INSERT INTO f_star (class, c, e, f) - VALUES ('f', 'hi keith'::name, '-8'::int2, + VALUES ('f', 'hi keith'::name, '-8'::int2, '(1111,3333),(2222,4444)'::polygon); INSERT INTO f_star (class, a, c) @@ -164,7 +164,7 @@ INSERT INTO f_star (class, a, e) VALUES ('f', 25, '-9'::int2); INSERT INTO f_star (class, a, f) - VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); + VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); INSERT INTO f_star (class, c, e) VALUES ('f', 'hi allison'::name, '-10'::int2); @@ -182,7 +182,7 @@ INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name); INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); -INSERT INTO f_star (class, f) +INSERT INTO f_star (class, f) VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); INSERT INTO f_star (class) VALUES ('f'); @@ -192,8 +192,8 @@ INSERT INTO f_star (class) VALUES ('f'); -- for internal portal (cursor) tests -- CREATE TABLE iportaltest ( - i int4, - d float4, + i int4, + d float4, p polygon ); diff --git a/src/test/regress/sql/create_operator.sql b/src/test/regress/sql/create_operator.sql index 5ce8128a24..dcad804eec 100644 --- a/src/test/regress/sql/create_operator.sql +++ b/src/test/regress/sql/create_operator.sql @@ -2,11 +2,11 @@ -- CREATE_OPERATOR -- -CREATE OPERATOR ## ( +CREATE OPERATOR ## ( leftarg = path, rightarg = path, procedure = path_inter, - commutator = ## + commutator = ## ); CREATE OPERATOR <% ( @@ -14,12 +14,12 @@ CREATE OPERATOR <% ( rightarg = widget, procedure = pt_in_widget, commutator = >% , - negator = >=% + negator = >=% ); CREATE OPERATOR @#@ ( - rightarg = int8, -- left unary - procedure = numeric_fac + rightarg = int8, -- left unary + procedure = numeric_fac ); CREATE OPERATOR #@# ( @@ -27,9 +27,9 @@ CREATE OPERATOR #@# ( procedure = numeric_fac ); -CREATE OPERATOR #%# ( - leftarg = int8, -- right unary - procedure = numeric_fac +CREATE OPERATOR #%# ( + leftarg = int8, -- right unary + procedure = numeric_fac ); -- Test comments diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index f491e8c142..e622b1f0f5 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -6,7 +6,7 @@ -- CLASS DEFINITIONS -- CREATE TABLE hobbies_r ( - name text, + name text, person text ); @@ -143,7 +143,7 @@ CREATE TABLE real_city ( -- f inherits from e (three-level single inheritance) -- CREATE TABLE a_star ( - class char, + class char, a int4 ); @@ -194,7 +194,7 @@ CREATE TABLE hash_f8_heap ( -- don't include the hash_ovfl_heap stuff in the distribution -- the data set is too large for what it's worth --- +-- -- CREATE TABLE hash_ovfl_heap ( -- x int4, -- y int4 @@ -216,7 +216,7 @@ CREATE TABLE bt_txt_heap ( ); CREATE TABLE bt_f8_heap ( - seqno float8, + seqno float8, random int4 ); @@ -232,11 +232,11 @@ CREATE TABLE array_index_op_test ( t text[] ); -CREATE TABLE IF NOT EXISTS test_tsvector( - t text, - a tsvector +CREATE TABLE IF NOT EXISTS test_tsvector( + t text, + a tsvector ); -CREATE TABLE IF NOT EXISTS test_tsvector( +CREATE TABLE IF NOT EXISTS test_tsvector( t text ); diff --git a/src/test/regress/sql/create_type.sql b/src/test/regress/sql/create_type.sql index c667313c71..a4906b64e1 100644 --- a/src/test/regress/sql/create_type.sql +++ b/src/test/regress/sql/create_type.sql @@ -8,7 +8,7 @@ -- of the "old style" approach of making the functions first. -- CREATE TYPE widget ( - internallength = 24, + internallength = 24, input = widget_in, output = widget_out, typmod_in = numerictypmodin, @@ -16,10 +16,10 @@ CREATE TYPE widget ( alignment = double ); -CREATE TYPE city_budget ( - internallength = 16, - input = int44in, - output = int44out, +CREATE TYPE city_budget ( + internallength = 16, + input = int44in, + output = int44out, element = int4, category = 'x', -- just to verify the system will take it preferred = true -- ditto diff --git a/src/test/regress/sql/create_view.sql b/src/test/regress/sql/create_view.sql index f8942c93f5..86cfc5162c 100644 --- a/src/test/regress/sql/create_view.sql +++ b/src/test/regress/sql/create_view.sql @@ -5,12 +5,12 @@ -- CREATE VIEW street AS - SELECT r.name, r.thepath, c.cname AS cname + SELECT r.name, r.thepath, c.cname AS cname FROM ONLY road r, real_city c WHERE c.outline ## r.thepath; CREATE VIEW iexit AS - SELECT ih.name, ih.thepath, + SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE ih.thepath ## r.thepath; @@ -61,7 +61,7 @@ CREATE OR REPLACE VIEW viewtest AS CREATE OR REPLACE VIEW viewtest AS SELECT a, b::numeric FROM viewtest_tbl; --- should work +-- should work CREATE OR REPLACE VIEW viewtest AS SELECT a, b, 0 AS c FROM viewtest_tbl; @@ -135,11 +135,11 @@ CREATE VIEW v9 AS SELECT seq1.is_called FROM seq1; CREATE VIEW v13_temp AS SELECT seq1_temp.is_called FROM seq1_temp; SELECT relname FROM pg_class - WHERE relname LIKE 'v_' + WHERE relname LIKE 'v_' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'temp_view_test') ORDER BY relname; SELECT relname FROM pg_class - WHERE relname LIKE 'v%' + WHERE relname LIKE 'v%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; @@ -164,7 +164,7 @@ SELECT relname FROM pg_class AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'testviewschm2') ORDER BY relname; SELECT relname FROM pg_class - WHERE relname LIKE 'temporal%' + WHERE relname LIKE 'temporal%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; diff --git a/src/test/regress/sql/drop.sql b/src/test/regress/sql/drop.sql index 5df1b6adce..da9297d8b6 100644 --- a/src/test/regress/sql/drop.sql +++ b/src/test/regress/sql/drop.sql @@ -5,7 +5,7 @@ -- -- this will fail if the user is not the postgres superuser. -- if it does, don't worry about it (you can turn usersuper --- back on as "postgres"). too many people don't follow +-- back on as "postgres"). too many people don't follow -- directions and run this as "postgres", though... -- UPDATE pg_user @@ -47,14 +47,14 @@ DROP OPERATOR ## (path, path); DROP OPERATOR <% (point, widget); --- left unary +-- left unary DROP OPERATOR @#@ (none, int4); --- right unary -DROP OPERATOR #@# (int4, none); +-- right unary +DROP OPERATOR #@# (int4, none); --- right unary -DROP OPERATOR #%# (int4, none); +-- right unary +DROP OPERATOR #%# (int4, none); -- diff --git a/src/test/regress/sql/drop_if_exists.sql b/src/test/regress/sql/drop_if_exists.sql index 62b3f579a5..3d7e46cf2e 100644 --- a/src/test/regress/sql/drop_if_exists.sql +++ b/src/test/regress/sql/drop_if_exists.sql @@ -1,6 +1,6 @@ --- +-- -- IF EXISTS tests --- +-- -- table (will be really dropped at the end) diff --git a/src/test/regress/sql/errors.sql b/src/test/regress/sql/errors.sql index cf63474160..2ee707c5c7 100644 --- a/src/test/regress/sql/errors.sql +++ b/src/test/regress/sql/errors.sql @@ -8,18 +8,18 @@ select 1; -- -- UNSUPPORTED STUFF - --- doesn't work + +-- doesn't work -- notify pg_class -- -- -- SELECT - --- missing relation name + +-- missing relation name select; --- no such relation +-- no such relation select * from nonesuch; -- missing target list @@ -43,74 +43,74 @@ select distinct on (foobar) * from pg_database; -- -- DELETE - --- missing relation name (this had better not wildcard!) + +-- missing relation name (this had better not wildcard!) delete from; --- no such relation +-- no such relation delete from nonesuch; -- -- DROP - --- missing relation name (this had better not wildcard!) + +-- missing relation name (this had better not wildcard!) drop table; --- no such relation +-- no such relation drop table nonesuch; -- -- ALTER TABLE - --- relation renaming --- missing relation name +-- relation renaming + +-- missing relation name alter table rename; --- no such relation +-- no such relation alter table nonesuch rename to newnonesuch; --- no such relation +-- no such relation alter table nonesuch rename to stud_emp; --- conflict +-- conflict alter table stud_emp rename to aggtest; --- self-conflict +-- self-conflict alter table stud_emp rename to stud_emp; --- attribute renaming +-- attribute renaming --- no such relation +-- no such relation alter table nonesuchrel rename column nonesuchatt to newnonesuchatt; --- no such attribute +-- no such attribute alter table emp rename column nonesuchatt to newnonesuchatt; --- conflict +-- conflict alter table emp rename column salary to manager; --- conflict +-- conflict alter table emp rename column salary to oid; -- -- TRANSACTION STUFF - --- not in a xact + +-- not in a xact abort; --- not in a xact +-- not in a xact end; -- -- CREATE AGGREGATE --- sfunc/finalfunc type disagreement +-- sfunc/finalfunc type disagreement create aggregate newavg2 (sfunc = int4pl, basetype = int4, stype = int4, @@ -125,33 +125,33 @@ create aggregate newcnt1 (sfunc = int4inc, -- -- DROP INDEX - --- missing index name + +-- missing index name drop index; --- bad index name +-- bad index name drop index 314159; --- no such index +-- no such index drop index nonesuch; -- -- DROP AGGREGATE - --- missing aggregate name + +-- missing aggregate name drop aggregate; -- missing aggregate type drop aggregate newcnt1; --- bad aggregate name +-- bad aggregate name drop aggregate 314159 (int); -- bad aggregate type drop aggregate newcnt (nonesuch); --- no such aggregate +-- no such aggregate drop aggregate nonesuch (int4); -- no such aggregate for type @@ -160,83 +160,83 @@ drop aggregate newcnt (float4); -- -- DROP FUNCTION - --- missing function name + +-- missing function name drop function (); --- bad function name +-- bad function name drop function 314159(); --- no such function +-- no such function drop function nonesuch(); -- -- DROP TYPE - --- missing type name + +-- missing type name drop type; --- bad type name +-- bad type name drop type 314159; --- no such type +-- no such type drop type nonesuch; -- -- DROP OPERATOR - --- missing everything + +-- missing everything drop operator; --- bad operator name +-- bad operator name drop operator equals; --- missing type list +-- missing type list drop operator ===; --- missing parentheses +-- missing parentheses drop operator int4, int4; --- missing operator name +-- missing operator name drop operator (int4, int4); --- missing type list contents +-- missing type list contents drop operator === (); --- no such operator +-- no such operator drop operator === (int4); --- no such operator by that name +-- no such operator by that name drop operator === (int4, int4); --- no such type1 +-- no such type1 drop operator = (nonesuch); --- no such type1 +-- no such type1 drop operator = ( , int4); --- no such type1 +-- no such type1 drop operator = (nonesuch, int4); --- no such type2 +-- no such type2 drop operator = (int4, nonesuch); --- no such type2 +-- no such type2 drop operator = (int4, ); -- -- DROP RULE - --- missing rule name + +-- missing rule name drop rule; --- bad rule name +-- bad rule name drop rule 314159; --- no such rule +-- no such rule drop rule nonesuch on noplace; -- these postquel variants are no longer supported @@ -289,7 +289,7 @@ INSERT INTO foo VALUES(123) foo; INSERT INTO 123 VALUES(123); -INSERT INTO foo +INSERT INTO foo VALUES(123) 123 ; @@ -300,7 +300,7 @@ CREATE TABLE foo id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); -- long line to be truncated on the left -CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); -- long line to be truncated on the right @@ -313,59 +313,59 @@ CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INT -- long line to be truncated on the left, many lines CREATE TEMPORARY -TABLE -foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, -id4 INT4 -UNIQUE -NOT -NULL, -id5 TEXT -UNIQUE -NOT +TABLE +foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +id4 INT4 +UNIQUE +NOT +NULL, +id5 TEXT +UNIQUE +NOT NULL) ; -- long line to be truncated on the right, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo( id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY) ; -- long line to be truncated both ways, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, +(id +INT4 +UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, idv INT4 UNIQUE NOT NULL); -- more than 10 lines... -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE -NOT +(id +INT4 +UNIQUE +NOT NULL -, +, idm -INT4 -UNIQUE -NOT +INT4 +UNIQUE +NOT NULL, -idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, -idv -INT4 -UNIQUE -NOT +idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, +idv +INT4 +UNIQUE +NOT NULL); -- Check that stack depth detection mechanism works and diff --git a/src/test/regress/sql/float4.sql b/src/test/regress/sql/float4.sql index 4ce6d9ea6e..3b363f9463 100644 --- a/src/test/regress/sql/float4.sql +++ b/src/test/regress/sql/float4.sql @@ -10,7 +10,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); --- test for over and under flow +-- test for over and under flow INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e70'); INSERT INTO FLOAT4_TBL(f1) VALUES ('10e-70'); @@ -73,7 +73,7 @@ SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f; SELECT '' AS five, * FROM FLOAT4_TBL; --- test the unary float4abs operator +-- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; UPDATE FLOAT4_TBL diff --git a/src/test/regress/sql/float8.sql b/src/test/regress/sql/float8.sql index 40f488d959..92a574ab7b 100644 --- a/src/test/regress/sql/float8.sql +++ b/src/test/regress/sql/float8.sql @@ -56,7 +56,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE '1004.3' >= f.f1; SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -75,15 +75,15 @@ SELECT '' AS three, f.f1, f.f1 - '-10' AS x SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 FROM FLOAT8_TBL f where f.f1 = '1004.3'; --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; @@ -97,7 +97,7 @@ select floor(f1) as floor_f1 from float8_tbl f; -- sign select sign(f1) as sign_f1 from float8_tbl f; --- square root +-- square root SELECT sqrt(float8 '64') AS eight; SELECT |/ float8 '64' AS eight; @@ -109,12 +109,12 @@ SELECT '' AS three, f.f1, |/f.f1 AS sqrt_f1 -- power SELECT power(float8 '144', float8 '0.5'); --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; --- cube root +-- cube root SELECT ||/ float8 '27' AS three; SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; @@ -142,7 +142,7 @@ SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; SELECT '' AS five, * FROM FLOAT8_TBL; --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400'); diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql index cc7b23f113..6d7bdbe77a 100644 --- a/src/test/regress/sql/foreign_key.sql +++ b/src/test/regress/sql/foreign_key.sql @@ -47,7 +47,7 @@ DROP TABLE PKTABLE; -- check set NULL and table constraint on multiple columns -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); -CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL); -- Test comments @@ -110,7 +110,7 @@ DROP TABLE FKTABLE; -- check set default and table constraint on multiple columns -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); -CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT); -- Insert a value in PKTABLE for default @@ -228,7 +228,7 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -273,7 +273,7 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -325,8 +325,8 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -379,8 +379,8 @@ INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); INSERT INTO PKTABLE VALUES (2, -1, 5, 'test5'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (2, 4, 5, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); @@ -442,7 +442,7 @@ DROP TABLE PKTABLE; -- -- Tests for mismatched types -- --- Basic one column, two table setup +-- Basic one column, two table setup CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); INSERT INTO PKTABLE VALUES(42); -- This next should fail, because int=inet does not exist @@ -502,7 +502,7 @@ DROP TABLE PKTABLE; CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable(ptest1, ptest2)); DROP TABLE PKTABLE; --- And this, +-- And this, CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable); DROP TABLE PKTABLE; diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql index 13ef74a1cb..411e8aed39 100644 --- a/src/test/regress/sql/hash_index.sql +++ b/src/test/regress/sql/hash_index.sql @@ -80,15 +80,15 @@ SELECT h.seqno AS i1492, h.random AS i1 FROM hash_i4_heap h WHERE h.random = 1; -UPDATE hash_i4_heap - SET seqno = 20000 +UPDATE hash_i4_heap + SET seqno = 20000 WHERE hash_i4_heap.random = 1492795354; -SELECT h.seqno AS i20000 +SELECT h.seqno AS i20000 FROM hash_i4_heap h WHERE h.random = 1492795354; -UPDATE hash_name_heap +UPDATE hash_name_heap SET random = '0123456789abcdef'::name WHERE hash_name_heap.seqno = 6543; @@ -101,13 +101,13 @@ UPDATE hash_name_heap WHERE hash_name_heap.random = '76652222'::name; -- --- this is the row we just replaced; index scan should return zero rows +-- this is the row we just replaced; index scan should return zero rows -- SELECT h.seqno AS emptyset FROM hash_name_heap h WHERE h.random = '76652222'::name; -UPDATE hash_txt_heap +UPDATE hash_txt_heap SET random = '0123456789abcdefghijklmnop'::text WHERE hash_txt_heap.seqno = 4002; @@ -127,11 +127,11 @@ UPDATE hash_f8_heap SET random = '-1234.1234'::float8 WHERE hash_f8_heap.seqno = 8906; -SELECT h.seqno AS i8096, h.random AS f1234_1234 +SELECT h.seqno AS i8096, h.random AS f1234_1234 FROM hash_f8_heap h WHERE h.random = '-1234.1234'::float8; -UPDATE hash_f8_heap +UPDATE hash_f8_heap SET seqno = 20000 WHERE hash_f8_heap.random = '488912369'::float8; diff --git a/src/test/regress/sql/hs_primary_extremes.sql b/src/test/regress/sql/hs_primary_extremes.sql index 2796bc3818..629efb4be5 100644 --- a/src/test/regress/sql/hs_primary_extremes.sql +++ b/src/test/regress/sql/hs_primary_extremes.sql @@ -8,8 +8,8 @@ drop table if exists hs_extreme; create table hs_extreme (col1 integer); CREATE OR REPLACE FUNCTION hs_subxids (n integer) -RETURNS void -LANGUAGE plpgsql +RETURNS void +LANGUAGE plpgsql AS $$ BEGIN IF n <= 0 THEN RETURN; END IF; @@ -29,13 +29,13 @@ COMMIT; set client_min_messages = 'warning'; CREATE OR REPLACE FUNCTION hs_locks_create (n integer) -RETURNS void -LANGUAGE plpgsql +RETURNS void +LANGUAGE plpgsql AS $$ BEGIN IF n <= 0 THEN CHECKPOINT; - RETURN; + RETURN; END IF; EXECUTE 'CREATE TABLE hs_locks_' || n::text || ' ()'; PERFORM hs_locks_create(n - 1); @@ -44,13 +44,13 @@ AS $$ $$; CREATE OR REPLACE FUNCTION hs_locks_drop (n integer) -RETURNS void -LANGUAGE plpgsql +RETURNS void +LANGUAGE plpgsql AS $$ BEGIN IF n <= 0 THEN CHECKPOINT; - RETURN; + RETURN; END IF; EXECUTE 'DROP TABLE IF EXISTS hs_locks_' || n::text; PERFORM hs_locks_drop(n - 1); diff --git a/src/test/regress/sql/inet.sql b/src/test/regress/sql/inet.sql index f88a17eabc..328f14907b 100644 --- a/src/test/regress/sql/inet.sql +++ b/src/test/regress/sql/inet.sql @@ -49,7 +49,7 @@ SELECT '' AS six, c AS cidr, i AS inet FROM INET_TBL WHERE c = i; SELECT '' AS ten, i, c, - i < c AS lt, i <= c AS le, i = c AS eq, + i < c AS lt, i <= c AS le, i = c AS eq, i >= c AS ge, i > c AS gt, i <> c AS ne, i << c AS sb, i <<= c AS sbe, i >> c AS sup, i >>= c AS spe diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql index e87cf66110..3087a14b72 100644 --- a/src/test/regress/sql/inherit.sql +++ b/src/test/regress/sql/inherit.sql @@ -140,7 +140,7 @@ CREATE TABLE inhx (xx text DEFAULT 'text'); * Test double inheritance * * Ensure that defaults are NOT included unless - * INCLUDING DEFAULTS is specified + * INCLUDING DEFAULTS is specified */ CREATE TABLE inhe (ee text, LIKE inhx) inherits (b); INSERT INTO inhe VALUES ('ee-col1', 'ee-col2', DEFAULT, 'ee-col4'); diff --git a/src/test/regress/sql/int2.sql b/src/test/regress/sql/int2.sql index 351f68a84e..f11eb283c6 100644 --- a/src/test/regress/sql/int2.sql +++ b/src/test/regress/sql/int2.sql @@ -53,10 +53,10 @@ SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int2 '0'; SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int4 '0'; --- positive odds +-- positive odds SELECT '' AS one, i.* FROM INT2_TBL i WHERE (i.f1 % int2 '2') = int2 '1'; --- any evens +-- any evens SELECT '' AS three, i.* FROM INT2_TBL i WHERE (i.f1 % int4 '2') = int2 '0'; SELECT '' AS five, i.f1, i.f1 * int2 '2' AS x FROM INT2_TBL i; diff --git a/src/test/regress/sql/int8.sql b/src/test/regress/sql/int8.sql index 597a9a2deb..27e0696b32 100644 --- a/src/test/regress/sql/int8.sql +++ b/src/test/regress/sql/int8.sql @@ -96,27 +96,27 @@ SELECT max(q1), max(q2) FROM INT8_TBL; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') +SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') FROM INT8_TBL; -SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; +SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') + FROM INT8_TBL; -SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') +SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') FROM INT8_TBL; -SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') +SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') FROM INT8_TBL; -SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; SELECT '' AS to_char_6, to_char(q2, 'FMS9999999999999999') FROM INT8_TBL; SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; -SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; -SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; -SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; -SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; +SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; -SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; +SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; SELECT '' AS to_char_14, to_char(q2, 'FM9999999999999999.999') FROM INT8_TBL; SELECT '' AS to_char_15, to_char(q2, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9') FROM INT8_TBL; SELECT '' AS to_char_16, to_char(q2, E'99999 "text" 9999 "9999" 999 "\\"text between quote marks\\"" 9999') FROM INT8_TBL; diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql index f342a18af2..9da2dc63e8 100644 --- a/src/test/regress/sql/interval.sql +++ b/src/test/regress/sql/interval.sql @@ -48,7 +48,7 @@ SELECT '' AS three, * FROM INTERVAL_TBL SELECT '' AS one, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 = interval '@ 34 years'; -SELECT '' AS five, * FROM INTERVAL_TBL +SELECT '' AS five, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 >= interval '@ 1 month'; SELECT '' AS nine, * FROM INTERVAL_TBL @@ -61,11 +61,11 @@ SELECT '' AS fortyfive, r1.*, r2.* -- Test multiplication and division with intervals. --- Floating point arithmetic rounding errors can lead to unexpected results, --- though the code attempts to do the right thing and round up to days and --- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. --- Note that it is expected for some day components to be greater than 29 and --- some time components be greater than 23:59:59 due to how intervals are +-- Floating point arithmetic rounding errors can lead to unexpected results, +-- though the code attempts to do the right thing and round up to days and +-- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. +-- Note that it is expected for some day components to be greater than 29 and +-- some time components be greater than 23:59:59 due to how intervals are -- stored internally. CREATE TABLE INTERVAL_MULDIV_TBL (span interval); @@ -249,7 +249,7 @@ select interval 'P0002' AS "year only", SET IntervalStyle to postgres_verbose; select interval '-10 mons -3 days +03:55:06.70'; select interval '1 year 2 mons 3 days 04:05:06.699999'; -select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; +select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; -- check that '30 days' equals '1 month' according to the hash function select '30 days'::interval = '1 month'::interval as t; diff --git a/src/test/regress/sql/limit.sql b/src/test/regress/sql/limit.sql index 3004550b65..fb86b6f6f7 100644 --- a/src/test/regress/sql/limit.sql +++ b/src/test/regress/sql/limit.sql @@ -3,31 +3,31 @@ -- Check the LIMIT/OFFSET feature of SELECT -- -SELECT ''::text AS two, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 50 +SELECT ''::text AS two, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 50 ORDER BY unique1 LIMIT 2; -SELECT ''::text AS five, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 60 +SELECT ''::text AS five, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 60 ORDER BY unique1 LIMIT 5; -SELECT ''::text AS two, unique1, unique2, stringu1 +SELECT ''::text AS two, unique1, unique2, stringu1 FROM onek WHERE unique1 > 60 AND unique1 < 63 ORDER BY unique1 LIMIT 5; -SELECT ''::text AS three, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 100 +SELECT ''::text AS three, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 100 ORDER BY unique1 LIMIT 3 OFFSET 20; -SELECT ''::text AS zero, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS zero, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 8 OFFSET 99; -SELECT ''::text AS eleven, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS eleven, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 20 OFFSET 39; -SELECT ''::text AS ten, unique1, unique2, stringu1 +SELECT ''::text AS ten, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990; -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990 LIMIT 5; -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 LIMIT 5 OFFSET 900; diff --git a/src/test/regress/sql/numeric.sql b/src/test/regress/sql/numeric.sql index 8814bba486..a1435ec85e 100644 --- a/src/test/regress/sql/numeric.sql +++ b/src/test/regress/sql/numeric.sql @@ -732,7 +732,7 @@ DROP TABLE width_bucket_test; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') +SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') FROM num_data; SELECT '' AS to_char_2, to_char(val, '9G999G999G999G999G999D999G999G999G999G999') @@ -744,18 +744,18 @@ SELECT '' AS to_char_3, to_char(val, '9999999999999999.999999999999999PR') SELECT '' AS to_char_4, to_char(val, '9999999999999999.999999999999999S') FROM num_data; -SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; SELECT '' AS to_char_6, to_char(val, 'FMS9999999999999999.999999999999999') FROM num_data; SELECT '' AS to_char_7, to_char(val, 'FM9999999999999999.999999999999999THPR') FROM num_data; -SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; -SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; -SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; -SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; +SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; SELECT '' AS to_char_12, to_char(val, 'FM9999999999999999.099999999999999') FROM num_data; SELECT '' AS to_char_13, to_char(val, 'FM9999999999990999.990999999999999') FROM num_data; SELECT '' AS to_char_14, to_char(val, 'FM0999999999999999.999909999999999') FROM num_data; SELECT '' AS to_char_15, to_char(val, 'FM9999999990999999.099999999999999') FROM num_data; -SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; +SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; SELECT '' AS to_char_17, to_char(val, 'FM9999999999999999.99999999999999') FROM num_data; SELECT '' AS to_char_18, to_char(val, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9') FROM num_data; SELECT '' AS to_char_19, to_char(val, 'FMS 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9') FROM num_data; diff --git a/src/test/regress/sql/oid.sql b/src/test/regress/sql/oid.sql index 1bdb127a4a..4a096891f5 100644 --- a/src/test/regress/sql/oid.sql +++ b/src/test/regress/sql/oid.sql @@ -14,7 +14,7 @@ INSERT INTO OID_TBL(f1) VALUES (' 10 '); -- leading/trailing hard tab is also allowed INSERT INTO OID_TBL(f1) VALUES (' 15 '); --- bad inputs +-- bad inputs INSERT INTO OID_TBL(f1) VALUES (''); INSERT INTO OID_TBL(f1) VALUES (' '); INSERT INTO OID_TBL(f1) VALUES ('asdfasd'); diff --git a/src/test/regress/sql/oidjoins.sql b/src/test/regress/sql/oidjoins.sql index 2f112fe489..995271b690 100644 --- a/src/test/regress/sql/oidjoins.sql +++ b/src/test/regress/sql/oidjoins.sql @@ -1,479 +1,479 @@ -- -- This is created by pgsql/src/tools/findoidjoins/make_oidjoins_check -- -SELECT ctid, aggfnoid -FROM pg_catalog.pg_aggregate fk -WHERE aggfnoid != 0 AND +SELECT ctid, aggfnoid +FROM pg_catalog.pg_aggregate fk +WHERE aggfnoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfnoid); -SELECT ctid, aggtransfn -FROM pg_catalog.pg_aggregate fk -WHERE aggtransfn != 0 AND +SELECT ctid, aggtransfn +FROM pg_catalog.pg_aggregate fk +WHERE aggtransfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggtransfn); -SELECT ctid, aggfinalfn -FROM pg_catalog.pg_aggregate fk -WHERE aggfinalfn != 0 AND +SELECT ctid, aggfinalfn +FROM pg_catalog.pg_aggregate fk +WHERE aggfinalfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfinalfn); -SELECT ctid, aggsortop -FROM pg_catalog.pg_aggregate fk -WHERE aggsortop != 0 AND +SELECT ctid, aggsortop +FROM pg_catalog.pg_aggregate fk +WHERE aggsortop != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.aggsortop); -SELECT ctid, aggtranstype -FROM pg_catalog.pg_aggregate fk -WHERE aggtranstype != 0 AND +SELECT ctid, aggtranstype +FROM pg_catalog.pg_aggregate fk +WHERE aggtranstype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.aggtranstype); -SELECT ctid, amkeytype -FROM pg_catalog.pg_am fk -WHERE amkeytype != 0 AND +SELECT ctid, amkeytype +FROM pg_catalog.pg_am fk +WHERE amkeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amkeytype); -SELECT ctid, aminsert -FROM pg_catalog.pg_am fk -WHERE aminsert != 0 AND +SELECT ctid, aminsert +FROM pg_catalog.pg_am fk +WHERE aminsert != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aminsert); -SELECT ctid, ambeginscan -FROM pg_catalog.pg_am fk -WHERE ambeginscan != 0 AND +SELECT ctid, ambeginscan +FROM pg_catalog.pg_am fk +WHERE ambeginscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambeginscan); -SELECT ctid, amgettuple -FROM pg_catalog.pg_am fk -WHERE amgettuple != 0 AND +SELECT ctid, amgettuple +FROM pg_catalog.pg_am fk +WHERE amgettuple != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgettuple); -SELECT ctid, amgetbitmap -FROM pg_catalog.pg_am fk -WHERE amgetbitmap != 0 AND +SELECT ctid, amgetbitmap +FROM pg_catalog.pg_am fk +WHERE amgetbitmap != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgetbitmap); -SELECT ctid, amrescan -FROM pg_catalog.pg_am fk -WHERE amrescan != 0 AND +SELECT ctid, amrescan +FROM pg_catalog.pg_am fk +WHERE amrescan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrescan); -SELECT ctid, amendscan -FROM pg_catalog.pg_am fk -WHERE amendscan != 0 AND +SELECT ctid, amendscan +FROM pg_catalog.pg_am fk +WHERE amendscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amendscan); -SELECT ctid, ammarkpos -FROM pg_catalog.pg_am fk -WHERE ammarkpos != 0 AND +SELECT ctid, ammarkpos +FROM pg_catalog.pg_am fk +WHERE ammarkpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ammarkpos); -SELECT ctid, amrestrpos -FROM pg_catalog.pg_am fk -WHERE amrestrpos != 0 AND +SELECT ctid, amrestrpos +FROM pg_catalog.pg_am fk +WHERE amrestrpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrestrpos); -SELECT ctid, ambuild -FROM pg_catalog.pg_am fk -WHERE ambuild != 0 AND +SELECT ctid, ambuild +FROM pg_catalog.pg_am fk +WHERE ambuild != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambuild); -SELECT ctid, ambulkdelete -FROM pg_catalog.pg_am fk -WHERE ambulkdelete != 0 AND +SELECT ctid, ambulkdelete +FROM pg_catalog.pg_am fk +WHERE ambulkdelete != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambulkdelete); -SELECT ctid, amvacuumcleanup -FROM pg_catalog.pg_am fk -WHERE amvacuumcleanup != 0 AND +SELECT ctid, amvacuumcleanup +FROM pg_catalog.pg_am fk +WHERE amvacuumcleanup != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amvacuumcleanup); -SELECT ctid, amcostestimate -FROM pg_catalog.pg_am fk -WHERE amcostestimate != 0 AND +SELECT ctid, amcostestimate +FROM pg_catalog.pg_am fk +WHERE amcostestimate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amcostestimate); -SELECT ctid, amoptions -FROM pg_catalog.pg_am fk -WHERE amoptions != 0 AND +SELECT ctid, amoptions +FROM pg_catalog.pg_am fk +WHERE amoptions != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amoptions); -SELECT ctid, amopfamily -FROM pg_catalog.pg_amop fk -WHERE amopfamily != 0 AND +SELECT ctid, amopfamily +FROM pg_catalog.pg_amop fk +WHERE amopfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amopfamily); -SELECT ctid, amoplefttype -FROM pg_catalog.pg_amop fk -WHERE amoplefttype != 0 AND +SELECT ctid, amoplefttype +FROM pg_catalog.pg_amop fk +WHERE amoplefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoplefttype); -SELECT ctid, amoprighttype -FROM pg_catalog.pg_amop fk -WHERE amoprighttype != 0 AND +SELECT ctid, amoprighttype +FROM pg_catalog.pg_amop fk +WHERE amoprighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoprighttype); -SELECT ctid, amopopr -FROM pg_catalog.pg_amop fk -WHERE amopopr != 0 AND +SELECT ctid, amopopr +FROM pg_catalog.pg_amop fk +WHERE amopopr != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.amopopr); -SELECT ctid, amopmethod -FROM pg_catalog.pg_amop fk -WHERE amopmethod != 0 AND +SELECT ctid, amopmethod +FROM pg_catalog.pg_amop fk +WHERE amopmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.amopmethod); -SELECT ctid, amprocfamily -FROM pg_catalog.pg_amproc fk -WHERE amprocfamily != 0 AND +SELECT ctid, amprocfamily +FROM pg_catalog.pg_amproc fk +WHERE amprocfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amprocfamily); -SELECT ctid, amproclefttype -FROM pg_catalog.pg_amproc fk -WHERE amproclefttype != 0 AND +SELECT ctid, amproclefttype +FROM pg_catalog.pg_amproc fk +WHERE amproclefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amproclefttype); -SELECT ctid, amprocrighttype -FROM pg_catalog.pg_amproc fk -WHERE amprocrighttype != 0 AND +SELECT ctid, amprocrighttype +FROM pg_catalog.pg_amproc fk +WHERE amprocrighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amprocrighttype); -SELECT ctid, amproc -FROM pg_catalog.pg_amproc fk -WHERE amproc != 0 AND +SELECT ctid, amproc +FROM pg_catalog.pg_amproc fk +WHERE amproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amproc); -SELECT ctid, attrelid -FROM pg_catalog.pg_attribute fk -WHERE attrelid != 0 AND +SELECT ctid, attrelid +FROM pg_catalog.pg_attribute fk +WHERE attrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.attrelid); -SELECT ctid, atttypid -FROM pg_catalog.pg_attribute fk -WHERE atttypid != 0 AND +SELECT ctid, atttypid +FROM pg_catalog.pg_attribute fk +WHERE atttypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.atttypid); -SELECT ctid, castsource -FROM pg_catalog.pg_cast fk -WHERE castsource != 0 AND +SELECT ctid, castsource +FROM pg_catalog.pg_cast fk +WHERE castsource != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.castsource); -SELECT ctid, casttarget -FROM pg_catalog.pg_cast fk -WHERE casttarget != 0 AND +SELECT ctid, casttarget +FROM pg_catalog.pg_cast fk +WHERE casttarget != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.casttarget); -SELECT ctid, castfunc -FROM pg_catalog.pg_cast fk -WHERE castfunc != 0 AND +SELECT ctid, castfunc +FROM pg_catalog.pg_cast fk +WHERE castfunc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.castfunc); -SELECT ctid, relnamespace -FROM pg_catalog.pg_class fk -WHERE relnamespace != 0 AND +SELECT ctid, relnamespace +FROM pg_catalog.pg_class fk +WHERE relnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.relnamespace); -SELECT ctid, reltype -FROM pg_catalog.pg_class fk -WHERE reltype != 0 AND +SELECT ctid, reltype +FROM pg_catalog.pg_class fk +WHERE reltype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.reltype); -SELECT ctid, relowner -FROM pg_catalog.pg_class fk -WHERE relowner != 0 AND +SELECT ctid, relowner +FROM pg_catalog.pg_class fk +WHERE relowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.relowner); -SELECT ctid, relam -FROM pg_catalog.pg_class fk -WHERE relam != 0 AND +SELECT ctid, relam +FROM pg_catalog.pg_class fk +WHERE relam != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.relam); -SELECT ctid, reltablespace -FROM pg_catalog.pg_class fk -WHERE reltablespace != 0 AND +SELECT ctid, reltablespace +FROM pg_catalog.pg_class fk +WHERE reltablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.reltablespace); -SELECT ctid, reltoastrelid -FROM pg_catalog.pg_class fk -WHERE reltoastrelid != 0 AND +SELECT ctid, reltoastrelid +FROM pg_catalog.pg_class fk +WHERE reltoastrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastrelid); -SELECT ctid, reltoastidxid -FROM pg_catalog.pg_class fk -WHERE reltoastidxid != 0 AND +SELECT ctid, reltoastidxid +FROM pg_catalog.pg_class fk +WHERE reltoastidxid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastidxid); -SELECT ctid, connamespace -FROM pg_catalog.pg_constraint fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_constraint fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); -SELECT ctid, contypid -FROM pg_catalog.pg_constraint fk -WHERE contypid != 0 AND +SELECT ctid, contypid +FROM pg_catalog.pg_constraint fk +WHERE contypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.contypid); -SELECT ctid, connamespace -FROM pg_catalog.pg_conversion fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_conversion fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); -SELECT ctid, conowner -FROM pg_catalog.pg_conversion fk -WHERE conowner != 0 AND +SELECT ctid, conowner +FROM pg_catalog.pg_conversion fk +WHERE conowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.conowner); -SELECT ctid, conproc -FROM pg_catalog.pg_conversion fk -WHERE conproc != 0 AND +SELECT ctid, conproc +FROM pg_catalog.pg_conversion fk +WHERE conproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.conproc); -SELECT ctid, datdba -FROM pg_catalog.pg_database fk -WHERE datdba != 0 AND +SELECT ctid, datdba +FROM pg_catalog.pg_database fk +WHERE datdba != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.datdba); -SELECT ctid, dattablespace -FROM pg_catalog.pg_database fk -WHERE dattablespace != 0 AND +SELECT ctid, dattablespace +FROM pg_catalog.pg_database fk +WHERE dattablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.dattablespace); -SELECT ctid, setdatabase -FROM pg_catalog.pg_db_role_setting fk -WHERE setdatabase != 0 AND +SELECT ctid, setdatabase +FROM pg_catalog.pg_db_role_setting fk +WHERE setdatabase != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_database pk WHERE pk.oid = fk.setdatabase); -SELECT ctid, classid -FROM pg_catalog.pg_depend fk -WHERE classid != 0 AND +SELECT ctid, classid +FROM pg_catalog.pg_depend fk +WHERE classid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classid); -SELECT ctid, refclassid -FROM pg_catalog.pg_depend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_depend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); -SELECT ctid, classoid -FROM pg_catalog.pg_description fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_description fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); -SELECT ctid, indexrelid -FROM pg_catalog.pg_index fk -WHERE indexrelid != 0 AND +SELECT ctid, indexrelid +FROM pg_catalog.pg_index fk +WHERE indexrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indexrelid); -SELECT ctid, indrelid -FROM pg_catalog.pg_index fk -WHERE indrelid != 0 AND +SELECT ctid, indrelid +FROM pg_catalog.pg_index fk +WHERE indrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indrelid); -SELECT ctid, lanowner -FROM pg_catalog.pg_language fk -WHERE lanowner != 0 AND +SELECT ctid, lanowner +FROM pg_catalog.pg_language fk +WHERE lanowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner); -SELECT ctid, lanplcallfoid -FROM pg_catalog.pg_language fk -WHERE lanplcallfoid != 0 AND +SELECT ctid, lanplcallfoid +FROM pg_catalog.pg_language fk +WHERE lanplcallfoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanplcallfoid); -SELECT ctid, laninline -FROM pg_catalog.pg_language fk -WHERE laninline != 0 AND +SELECT ctid, laninline +FROM pg_catalog.pg_language fk +WHERE laninline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.laninline); -SELECT ctid, lanvalidator -FROM pg_catalog.pg_language fk -WHERE lanvalidator != 0 AND +SELECT ctid, lanvalidator +FROM pg_catalog.pg_language fk +WHERE lanvalidator != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanvalidator); -SELECT ctid, nspowner -FROM pg_catalog.pg_namespace fk -WHERE nspowner != 0 AND +SELECT ctid, nspowner +FROM pg_catalog.pg_namespace fk +WHERE nspowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.nspowner); -SELECT ctid, opcmethod -FROM pg_catalog.pg_opclass fk -WHERE opcmethod != 0 AND +SELECT ctid, opcmethod +FROM pg_catalog.pg_opclass fk +WHERE opcmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opcmethod); -SELECT ctid, opcnamespace -FROM pg_catalog.pg_opclass fk -WHERE opcnamespace != 0 AND +SELECT ctid, opcnamespace +FROM pg_catalog.pg_opclass fk +WHERE opcnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opcnamespace); -SELECT ctid, opcowner -FROM pg_catalog.pg_opclass fk -WHERE opcowner != 0 AND +SELECT ctid, opcowner +FROM pg_catalog.pg_opclass fk +WHERE opcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opcowner); -SELECT ctid, opcfamily -FROM pg_catalog.pg_opclass fk -WHERE opcfamily != 0 AND +SELECT ctid, opcfamily +FROM pg_catalog.pg_opclass fk +WHERE opcfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.opcfamily); -SELECT ctid, opcintype -FROM pg_catalog.pg_opclass fk -WHERE opcintype != 0 AND +SELECT ctid, opcintype +FROM pg_catalog.pg_opclass fk +WHERE opcintype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opcintype); -SELECT ctid, opckeytype -FROM pg_catalog.pg_opclass fk -WHERE opckeytype != 0 AND +SELECT ctid, opckeytype +FROM pg_catalog.pg_opclass fk +WHERE opckeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opckeytype); -SELECT ctid, oprnamespace -FROM pg_catalog.pg_operator fk -WHERE oprnamespace != 0 AND +SELECT ctid, oprnamespace +FROM pg_catalog.pg_operator fk +WHERE oprnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.oprnamespace); -SELECT ctid, oprowner -FROM pg_catalog.pg_operator fk -WHERE oprowner != 0 AND +SELECT ctid, oprowner +FROM pg_catalog.pg_operator fk +WHERE oprowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.oprowner); -SELECT ctid, oprleft -FROM pg_catalog.pg_operator fk -WHERE oprleft != 0 AND +SELECT ctid, oprleft +FROM pg_catalog.pg_operator fk +WHERE oprleft != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprleft); -SELECT ctid, oprright -FROM pg_catalog.pg_operator fk -WHERE oprright != 0 AND +SELECT ctid, oprright +FROM pg_catalog.pg_operator fk +WHERE oprright != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprright); -SELECT ctid, oprresult -FROM pg_catalog.pg_operator fk -WHERE oprresult != 0 AND +SELECT ctid, oprresult +FROM pg_catalog.pg_operator fk +WHERE oprresult != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprresult); -SELECT ctid, oprcom -FROM pg_catalog.pg_operator fk -WHERE oprcom != 0 AND +SELECT ctid, oprcom +FROM pg_catalog.pg_operator fk +WHERE oprcom != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprcom); -SELECT ctid, oprnegate -FROM pg_catalog.pg_operator fk -WHERE oprnegate != 0 AND +SELECT ctid, oprnegate +FROM pg_catalog.pg_operator fk +WHERE oprnegate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprnegate); -SELECT ctid, oprcode -FROM pg_catalog.pg_operator fk -WHERE oprcode != 0 AND +SELECT ctid, oprcode +FROM pg_catalog.pg_operator fk +WHERE oprcode != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprcode); -SELECT ctid, oprrest -FROM pg_catalog.pg_operator fk -WHERE oprrest != 0 AND +SELECT ctid, oprrest +FROM pg_catalog.pg_operator fk +WHERE oprrest != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprrest); -SELECT ctid, oprjoin -FROM pg_catalog.pg_operator fk -WHERE oprjoin != 0 AND +SELECT ctid, oprjoin +FROM pg_catalog.pg_operator fk +WHERE oprjoin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprjoin); -SELECT ctid, opfmethod -FROM pg_catalog.pg_opfamily fk -WHERE opfmethod != 0 AND +SELECT ctid, opfmethod +FROM pg_catalog.pg_opfamily fk +WHERE opfmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opfmethod); -SELECT ctid, opfnamespace -FROM pg_catalog.pg_opfamily fk -WHERE opfnamespace != 0 AND +SELECT ctid, opfnamespace +FROM pg_catalog.pg_opfamily fk +WHERE opfnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opfnamespace); -SELECT ctid, opfowner -FROM pg_catalog.pg_opfamily fk -WHERE opfowner != 0 AND +SELECT ctid, opfowner +FROM pg_catalog.pg_opfamily fk +WHERE opfowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opfowner); -SELECT ctid, pronamespace -FROM pg_catalog.pg_proc fk -WHERE pronamespace != 0 AND +SELECT ctid, pronamespace +FROM pg_catalog.pg_proc fk +WHERE pronamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.pronamespace); -SELECT ctid, proowner -FROM pg_catalog.pg_proc fk -WHERE proowner != 0 AND +SELECT ctid, proowner +FROM pg_catalog.pg_proc fk +WHERE proowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.proowner); -SELECT ctid, prolang -FROM pg_catalog.pg_proc fk -WHERE prolang != 0 AND +SELECT ctid, prolang +FROM pg_catalog.pg_proc fk +WHERE prolang != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_language pk WHERE pk.oid = fk.prolang); -SELECT ctid, prorettype -FROM pg_catalog.pg_proc fk -WHERE prorettype != 0 AND +SELECT ctid, prorettype +FROM pg_catalog.pg_proc fk +WHERE prorettype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.prorettype); -SELECT ctid, ev_class -FROM pg_catalog.pg_rewrite fk -WHERE ev_class != 0 AND +SELECT ctid, ev_class +FROM pg_catalog.pg_rewrite fk +WHERE ev_class != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.ev_class); -SELECT ctid, refclassid -FROM pg_catalog.pg_shdepend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_shdepend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); -SELECT ctid, classoid -FROM pg_catalog.pg_shdescription fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_shdescription fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); -SELECT ctid, starelid -FROM pg_catalog.pg_statistic fk -WHERE starelid != 0 AND +SELECT ctid, starelid +FROM pg_catalog.pg_statistic fk +WHERE starelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.starelid); -SELECT ctid, staop1 -FROM pg_catalog.pg_statistic fk -WHERE staop1 != 0 AND +SELECT ctid, staop1 +FROM pg_catalog.pg_statistic fk +WHERE staop1 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop1); -SELECT ctid, staop2 -FROM pg_catalog.pg_statistic fk -WHERE staop2 != 0 AND +SELECT ctid, staop2 +FROM pg_catalog.pg_statistic fk +WHERE staop2 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop2); -SELECT ctid, staop3 -FROM pg_catalog.pg_statistic fk -WHERE staop3 != 0 AND +SELECT ctid, staop3 +FROM pg_catalog.pg_statistic fk +WHERE staop3 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop3); -SELECT ctid, spcowner -FROM pg_catalog.pg_tablespace fk -WHERE spcowner != 0 AND +SELECT ctid, spcowner +FROM pg_catalog.pg_tablespace fk +WHERE spcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.spcowner); -SELECT ctid, cfgnamespace -FROM pg_catalog.pg_ts_config fk -WHERE cfgnamespace != 0 AND +SELECT ctid, cfgnamespace +FROM pg_catalog.pg_ts_config fk +WHERE cfgnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.cfgnamespace); -SELECT ctid, cfgowner -FROM pg_catalog.pg_ts_config fk -WHERE cfgowner != 0 AND +SELECT ctid, cfgowner +FROM pg_catalog.pg_ts_config fk +WHERE cfgowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.cfgowner); -SELECT ctid, cfgparser -FROM pg_catalog.pg_ts_config fk -WHERE cfgparser != 0 AND +SELECT ctid, cfgparser +FROM pg_catalog.pg_ts_config fk +WHERE cfgparser != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_parser pk WHERE pk.oid = fk.cfgparser); -SELECT ctid, mapcfg -FROM pg_catalog.pg_ts_config_map fk -WHERE mapcfg != 0 AND +SELECT ctid, mapcfg +FROM pg_catalog.pg_ts_config_map fk +WHERE mapcfg != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_config pk WHERE pk.oid = fk.mapcfg); -SELECT ctid, mapdict -FROM pg_catalog.pg_ts_config_map fk -WHERE mapdict != 0 AND +SELECT ctid, mapdict +FROM pg_catalog.pg_ts_config_map fk +WHERE mapdict != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_dict pk WHERE pk.oid = fk.mapdict); -SELECT ctid, dictnamespace -FROM pg_catalog.pg_ts_dict fk -WHERE dictnamespace != 0 AND +SELECT ctid, dictnamespace +FROM pg_catalog.pg_ts_dict fk +WHERE dictnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.dictnamespace); -SELECT ctid, dictowner -FROM pg_catalog.pg_ts_dict fk -WHERE dictowner != 0 AND +SELECT ctid, dictowner +FROM pg_catalog.pg_ts_dict fk +WHERE dictowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.dictowner); -SELECT ctid, dicttemplate -FROM pg_catalog.pg_ts_dict fk -WHERE dicttemplate != 0 AND +SELECT ctid, dicttemplate +FROM pg_catalog.pg_ts_dict fk +WHERE dicttemplate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_template pk WHERE pk.oid = fk.dicttemplate); -SELECT ctid, prsnamespace -FROM pg_catalog.pg_ts_parser fk -WHERE prsnamespace != 0 AND +SELECT ctid, prsnamespace +FROM pg_catalog.pg_ts_parser fk +WHERE prsnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.prsnamespace); -SELECT ctid, prsstart -FROM pg_catalog.pg_ts_parser fk -WHERE prsstart != 0 AND +SELECT ctid, prsstart +FROM pg_catalog.pg_ts_parser fk +WHERE prsstart != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsstart); -SELECT ctid, prstoken -FROM pg_catalog.pg_ts_parser fk -WHERE prstoken != 0 AND +SELECT ctid, prstoken +FROM pg_catalog.pg_ts_parser fk +WHERE prstoken != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prstoken); -SELECT ctid, prsend -FROM pg_catalog.pg_ts_parser fk -WHERE prsend != 0 AND +SELECT ctid, prsend +FROM pg_catalog.pg_ts_parser fk +WHERE prsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsend); -SELECT ctid, prsheadline -FROM pg_catalog.pg_ts_parser fk -WHERE prsheadline != 0 AND +SELECT ctid, prsheadline +FROM pg_catalog.pg_ts_parser fk +WHERE prsheadline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsheadline); -SELECT ctid, prslextype -FROM pg_catalog.pg_ts_parser fk -WHERE prslextype != 0 AND +SELECT ctid, prslextype +FROM pg_catalog.pg_ts_parser fk +WHERE prslextype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prslextype); -SELECT ctid, tmplnamespace -FROM pg_catalog.pg_ts_template fk -WHERE tmplnamespace != 0 AND +SELECT ctid, tmplnamespace +FROM pg_catalog.pg_ts_template fk +WHERE tmplnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.tmplnamespace); -SELECT ctid, tmplinit -FROM pg_catalog.pg_ts_template fk -WHERE tmplinit != 0 AND +SELECT ctid, tmplinit +FROM pg_catalog.pg_ts_template fk +WHERE tmplinit != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmplinit); -SELECT ctid, tmpllexize -FROM pg_catalog.pg_ts_template fk -WHERE tmpllexize != 0 AND +SELECT ctid, tmpllexize +FROM pg_catalog.pg_ts_template fk +WHERE tmpllexize != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmpllexize); -SELECT ctid, typnamespace -FROM pg_catalog.pg_type fk -WHERE typnamespace != 0 AND +SELECT ctid, typnamespace +FROM pg_catalog.pg_type fk +WHERE typnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.typnamespace); -SELECT ctid, typowner -FROM pg_catalog.pg_type fk -WHERE typowner != 0 AND +SELECT ctid, typowner +FROM pg_catalog.pg_type fk +WHERE typowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.typowner); -SELECT ctid, typrelid -FROM pg_catalog.pg_type fk -WHERE typrelid != 0 AND +SELECT ctid, typrelid +FROM pg_catalog.pg_type fk +WHERE typrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.typrelid); -SELECT ctid, typelem -FROM pg_catalog.pg_type fk -WHERE typelem != 0 AND +SELECT ctid, typelem +FROM pg_catalog.pg_type fk +WHERE typelem != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typelem); -SELECT ctid, typarray -FROM pg_catalog.pg_type fk -WHERE typarray != 0 AND +SELECT ctid, typarray +FROM pg_catalog.pg_type fk +WHERE typarray != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray); -SELECT ctid, typinput -FROM pg_catalog.pg_type fk -WHERE typinput != 0 AND +SELECT ctid, typinput +FROM pg_catalog.pg_type fk +WHERE typinput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typinput); -SELECT ctid, typoutput -FROM pg_catalog.pg_type fk -WHERE typoutput != 0 AND +SELECT ctid, typoutput +FROM pg_catalog.pg_type fk +WHERE typoutput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typoutput); -SELECT ctid, typreceive -FROM pg_catalog.pg_type fk -WHERE typreceive != 0 AND +SELECT ctid, typreceive +FROM pg_catalog.pg_type fk +WHERE typreceive != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typreceive); -SELECT ctid, typsend -FROM pg_catalog.pg_type fk -WHERE typsend != 0 AND +SELECT ctid, typsend +FROM pg_catalog.pg_type fk +WHERE typsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typsend); -SELECT ctid, typmodin -FROM pg_catalog.pg_type fk -WHERE typmodin != 0 AND +SELECT ctid, typmodin +FROM pg_catalog.pg_type fk +WHERE typmodin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodin); -SELECT ctid, typmodout -FROM pg_catalog.pg_type fk -WHERE typmodout != 0 AND +SELECT ctid, typmodout +FROM pg_catalog.pg_type fk +WHERE typmodout != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodout); -SELECT ctid, typanalyze -FROM pg_catalog.pg_type fk -WHERE typanalyze != 0 AND +SELECT ctid, typanalyze +FROM pg_catalog.pg_type fk +WHERE typanalyze != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typanalyze); -SELECT ctid, typbasetype -FROM pg_catalog.pg_type fk -WHERE typbasetype != 0 AND +SELECT ctid, typbasetype +FROM pg_catalog.pg_type fk +WHERE typbasetype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typbasetype); diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql index 015fbd6317..d0f4e3b5e1 100644 --- a/src/test/regress/sql/plpgsql.sql +++ b/src/test/regress/sql/plpgsql.sql @@ -2657,7 +2657,7 @@ select exc_using(5, 'foobar'); drop function exc_using(int, text); create or replace function exc_using(int) returns void as $$ -declare +declare c refcursor; i int; begin @@ -2668,7 +2668,7 @@ begin raise notice '%', i; end loop; close c; - return; + return; end; $$ language plpgsql; diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql index 40cd4ec022..1b62b10d40 100644 --- a/src/test/regress/sql/point.sql +++ b/src/test/regress/sql/point.sql @@ -14,7 +14,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(5.1, 34.5)'); INSERT INTO POINT_TBL(f1) VALUES ('(-5.0,-12.0)'); --- bad format points +-- bad format points INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); INSERT INTO POINT_TBL(f1) VALUES ('10.0,10.0'); @@ -26,22 +26,22 @@ INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0'); SELECT '' AS six, * FROM POINT_TBL; --- left of +-- left of SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; --- right of +-- right of SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1; --- above +-- above SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >^ p.f1; --- below +-- below SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 <^ '(0.0, 0.0)'; --- equal +-- equal SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 ~= '(5.1, 34.5)'; --- point in box +-- point in box SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 <@ box '(0,0,100,100)'; @@ -77,6 +77,6 @@ SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dis -- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10 SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance - FROM POINT_TBL p1, POINT_TBL p2 + FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1 ORDER BY distance; diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql index 1b3903b782..2dad566f37 100644 --- a/src/test/regress/sql/polygon.sql +++ b/src/test/regress/sql/polygon.sql @@ -21,12 +21,12 @@ INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)'); --- degenerate polygons +-- degenerate polygons INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)'); --- bad polygon input strings +-- bad polygon input strings INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0'); @@ -40,42 +40,42 @@ INSERT INTO POLYGON_TBL(f1) VALUES ('asdf'); SELECT '' AS four, * FROM POLYGON_TBL; --- overlap +-- overlap SELECT '' AS three, p.* FROM POLYGON_TBL p WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- left overlap -SELECT '' AS four, p.* +-- left overlap +SELECT '' AS four, p.* FROM POLYGON_TBL p WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- right overlap -SELECT '' AS two, p.* +-- right overlap +SELECT '' AS two, p.* FROM POLYGON_TBL p WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- left of +-- left of SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- right of +-- right of SELECT '' AS zero, p.* FROM POLYGON_TBL p WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- contained -SELECT '' AS one, p.* +-- contained +SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- same +-- same SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- contains +-- contains SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -93,27 +93,27 @@ SELECT '' AS one, p.* -- -- 0 1 2 3 4 -- --- left of +-- left of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- left overlap +-- left overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; --- right overlap +-- right overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' &> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- right of +-- right of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' >> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- contained in +-- contained in SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- contains +-- contains SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; -- +------------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +------------------------+ -- 3 @@ -122,10 +122,10 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),( SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "false"; -- +-----------+ --- | *---* / --- | | |/ --- | | + --- | | |\ +-- | *---* / +-- | | |/ +-- | | + +-- | | |\ -- | *---* \ -- +-----------+ SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true"; @@ -148,15 +148,15 @@ SELECT '((1,1),(1,4),(5,4),(5,3),(2,3),(2,2),(5,2),(5,1))'::polygon @> '((3,2),( -- +---------+ SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::polygon AS "true"; --- same +-- same SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- overlap +-- overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; -- +--------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +--------------------+ -- 3 diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql index 585a7c25ea..02286c4096 100644 --- a/src/test/regress/sql/portals.sql +++ b/src/test/regress/sql/portals.sql @@ -461,12 +461,12 @@ ROLLBACK; -- Make sure snapshot management works okay, per bug report in -- 235395b90909301035v7228ce63q392931f15aa74b31@mail.gmail.com -BEGIN; -SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -CREATE TABLE cursor (a int); -INSERT INTO cursor VALUES (1); -DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; -UPDATE cursor SET a = 2; -FETCH ALL FROM c1; -COMMIT; +BEGIN; +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; +CREATE TABLE cursor (a int); +INSERT INTO cursor VALUES (1); +DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; +UPDATE cursor SET a = 2; +FETCH ALL FROM c1; +COMMIT; DROP TABLE cursor; diff --git a/src/test/regress/sql/portals_p2.sql b/src/test/regress/sql/portals_p2.sql index 190035ae01..555820da39 100644 --- a/src/test/regress/sql/portals_p2.sql +++ b/src/test/regress/sql/portals_p2.sql @@ -4,43 +4,43 @@ BEGIN; -DECLARE foo13 CURSOR FOR +DECLARE foo13 CURSOR FOR SELECT * FROM onek WHERE unique1 = 50; -DECLARE foo14 CURSOR FOR +DECLARE foo14 CURSOR FOR SELECT * FROM onek WHERE unique1 = 51; -DECLARE foo15 CURSOR FOR +DECLARE foo15 CURSOR FOR SELECT * FROM onek WHERE unique1 = 52; -DECLARE foo16 CURSOR FOR +DECLARE foo16 CURSOR FOR SELECT * FROM onek WHERE unique1 = 53; -DECLARE foo17 CURSOR FOR +DECLARE foo17 CURSOR FOR SELECT * FROM onek WHERE unique1 = 54; -DECLARE foo18 CURSOR FOR +DECLARE foo18 CURSOR FOR SELECT * FROM onek WHERE unique1 = 55; -DECLARE foo19 CURSOR FOR +DECLARE foo19 CURSOR FOR SELECT * FROM onek WHERE unique1 = 56; -DECLARE foo20 CURSOR FOR +DECLARE foo20 CURSOR FOR SELECT * FROM onek WHERE unique1 = 57; -DECLARE foo21 CURSOR FOR +DECLARE foo21 CURSOR FOR SELECT * FROM onek WHERE unique1 = 58; -DECLARE foo22 CURSOR FOR +DECLARE foo22 CURSOR FOR SELECT * FROM onek WHERE unique1 = 59; -DECLARE foo23 CURSOR FOR +DECLARE foo23 CURSOR FOR SELECT * FROM onek WHERE unique1 = 60; -DECLARE foo24 CURSOR FOR +DECLARE foo24 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 50; -DECLARE foo25 CURSOR FOR +DECLARE foo25 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 60; FETCH all in foo13; diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql index c7cf788b20..16dc106ab0 100644 --- a/src/test/regress/sql/rules.sql +++ b/src/test/regress/sql/rules.sql @@ -37,9 +37,9 @@ create table rtest_person (pname text, pdesc text); create table rtest_admin (pname text, sysname text); create rule rtest_sys_upd as on update to rtest_system do also ( - update rtest_interface set sysname = new.sysname + update rtest_interface set sysname = new.sysname where sysname = old.sysname; - update rtest_admin set sysname = new.sysname + update rtest_admin set sysname = new.sysname where sysname = old.sysname ); @@ -75,7 +75,7 @@ create rule rtest_emp_del as on delete to rtest_emp do -- -- Tables and rules for the multiple cascaded qualified instead --- rule test +-- rule test -- create table rtest_t4 (a int4, b text); create table rtest_t5 (a int4, b text); @@ -420,7 +420,7 @@ create table rtest_view1 (a int4, b text, v bool); create table rtest_view2 (a int4); create table rtest_view3 (a int4, b text); create table rtest_view4 (a int4, b text, c int4); -create view rtest_vview1 as select a, b from rtest_view1 X +create view rtest_vview1 as select a, b from rtest_view1 X where 0 < (select count(*) from rtest_view2 Y where Y.a = X.a); create view rtest_vview2 as select a, b from rtest_view1 where v; create view rtest_vview3 as select a, b from rtest_vview2 X @@ -493,7 +493,7 @@ create table rtest_unitfact ( factor float ); -create view rtest_vcomp as +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; @@ -746,7 +746,7 @@ create rule rrule as on update to vview do instead ( insert into cchild (pid, descrip) - select old.pid, new.descrip where old.descrip isnull; + select old.pid, new.descrip where old.descrip isnull; update cchild set descrip = new.descrip where cchild.pid = old.pid; ); @@ -770,7 +770,7 @@ drop table cchild; -- SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schema' ORDER BY viewname; -SELECT tablename, rulename, definition FROM pg_rules +SELECT tablename, rulename, definition FROM pg_rules ORDER BY tablename, rulename; -- @@ -797,14 +797,14 @@ SELECT * FROM ruletest_tbl2; create table rule_and_refint_t1 ( id1a integer, id1b integer, - + primary key (id1a, id1b) ); create table rule_and_refint_t2 ( id2a integer, id2c integer, - + primary key (id2a, id2c) ); @@ -901,11 +901,11 @@ create temp table t1 (a integer primary key); create temp table t1_1 (check (a >= 0 and a < 10)) inherits (t1); create temp table t1_2 (check (a >= 10 and a < 20)) inherits (t1); -create rule t1_ins_1 as on insert to t1 +create rule t1_ins_1 as on insert to t1 where new.a >= 0 and new.a < 10 do instead insert into t1_1 values (new.a); -create rule t1_ins_2 as on insert to t1 +create rule t1_ins_2 as on insert to t1 where new.a >= 10 and new.a < 20 do instead insert into t1_2 values (new.a); diff --git a/src/test/regress/sql/select.sql b/src/test/regress/sql/select.sql index 451fcf78d9..b99fb13c7d 100644 --- a/src/test/regress/sql/select.sql +++ b/src/test/regress/sql/select.sql @@ -13,24 +13,24 @@ SELECT * FROM onek -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using >; -- -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY stringu1 using <; - + -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1d -2 +0nr -1 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY string4 using <, unique1 using >; - + -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1dr -2 +0n -1 @@ -38,7 +38,7 @@ SELECT onek.unique1, onek.string4 FROM onek SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 > 980 ORDER BY string4 using >, unique1 using <; - + -- -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0nr -1 +1d -2 @@ -52,7 +52,7 @@ SELECT onek.unique1, onek.string4 FROM onek -- sort +0n -1 +1dr -2 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using <, string4 using >; -- @@ -77,7 +77,7 @@ SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10; -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek2.unique1, onek2.stringu1 FROM onek2 - WHERE onek2.unique1 < 20 + WHERE onek2.unique1 < 20 ORDER BY unique1 using >; -- diff --git a/src/test/regress/sql/select_implicit.sql b/src/test/regress/sql/select_implicit.sql index 448405bb1e..d815504222 100644 --- a/src/test/regress/sql/select_implicit.sql +++ b/src/test/regress/sql/select_implicit.sql @@ -55,7 +55,7 @@ SELECT c, count(*) FROM test_missing_target GROUP BY 3; -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; @@ -75,19 +75,19 @@ SELECT a/2, a/2 FROM test_missing_target GROUP BY a/2 ORDER BY a/2; -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -125,25 +125,25 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/sql/sequence.sql b/src/test/regress/sql/sequence.sql index af35a054d8..433e992994 100644 --- a/src/test/regress/sql/sequence.sql +++ b/src/test/regress/sql/sequence.sql @@ -1,19 +1,19 @@ --- --- test creation of SERIAL column --- - + CREATE TABLE serialTest (f1 text, f2 serial); - + INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('wrong', NULL); - + SELECT * FROM serialTest; -- basic sequence operations using both text and oid references CREATE SEQUENCE sequence_test; - + SELECT nextval('sequence_test'::text); SELECT nextval('sequence_test'::regclass); SELECT currval('sequence_test'::text); diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql index 9d13c39c8a..296e38b8c1 100644 --- a/src/test/regress/sql/subselect.sql +++ b/src/test/regress/sql/subselect.sql @@ -169,7 +169,7 @@ SELECT *, ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status", (CASE WHEN ord.ordercancelled @@ -184,7 +184,7 @@ END) AS "Status", ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status_OK" FROM orderstest ord; diff --git a/src/test/regress/sql/timestamp.sql b/src/test/regress/sql/timestamp.sql index 790ade3137..c4ed4eee3b 100644 --- a/src/test/regress/sql/timestamp.sql +++ b/src/test/regress/sql/timestamp.sql @@ -141,7 +141,7 @@ INSERT INTO TIMESTAMP_TBL VALUES ('Jan 01 17:32:01 2001'); INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 -0097'); INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 5097 BC'); -SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; -- Demonstrate functions and operators SELECT '' AS "48", d1 FROM TIMESTAMP_TBL @@ -190,7 +190,7 @@ SELECT '' AS "54", d1 as "timestamp", FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01'; -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMP_TBL; SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') @@ -199,23 +199,23 @@ SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth F SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') FROM TIMESTAMP_TBL; SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') + FROM TIMESTAMP_TBL; + +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') FROM TIMESTAMP_TBL; - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMP_TBL; SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID') FROM TIMESTAMP_TBL; diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql index e74691cc04..863b2865cb 100644 --- a/src/test/regress/sql/timestamptz.sql +++ b/src/test/regress/sql/timestamptz.sql @@ -160,7 +160,7 @@ SELECT 'Wed Jul 11 10:51:14 GMT+4 2001'::timestamptz; SELECT 'Wed Jul 11 10:51:14 PST-03:00 2001'::timestamptz; SELECT 'Wed Jul 11 10:51:14 PST+03:00 2001'::timestamptz; -SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; -- Demonstrate functions and operators SELECT '' AS "48", d1 FROM TIMESTAMPTZ_TBL @@ -208,32 +208,32 @@ SELECT '' AS "54", d1 as timestamptz, FROM TIMESTAMPTZ_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01'; -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMPTZ_TBL; - + SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') FROM TIMESTAMPTZ_TBL; - -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') - FROM TIMESTAMPTZ_TBL; - -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') + +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') + FROM TIMESTAMPTZ_TBL; + +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') + FROM TIMESTAMPTZ_TBL; + +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') FROM TIMESTAMPTZ_TBL; -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') - FROM TIMESTAMPTZ_TBL; - SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; + +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') + FROM TIMESTAMPTZ_TBL; -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') FROM TIMESTAMPTZ_TBL; - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMPTZ_TBL; SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID') FROM TIMESTAMPTZ_TBL; diff --git a/src/test/regress/sql/tinterval.sql b/src/test/regress/sql/tinterval.sql index 5abdb6d106..42399ce694 100644 --- a/src/test/regress/sql/tinterval.sql +++ b/src/test/regress/sql/tinterval.sql @@ -23,7 +23,7 @@ INSERT INTO TINTERVAL_TBL (f1) VALUES ('["Feb 15 1990 12:15:03" "2001-09-23 11:12:13"]'); --- badly formatted tintervals +-- badly formatted tintervals INSERT INTO TINTERVAL_TBL (f1) VALUES ('["bad time specifications" ""]'); @@ -84,7 +84,7 @@ SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2 -- contains SELECT '' AS five, t1.f1 FROM TINTERVAL_TBL t1 - WHERE not t1.f1 << + WHERE not t1.f1 << tinterval '["Aug 15 14:23:19 1980" "Sep 16 14:23:19 1990"]' ORDER BY t1.f1; diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql index c670ae18d0..17e830e7a4 100644 --- a/src/test/regress/sql/transactions.sql +++ b/src/test/regress/sql/transactions.sql @@ -4,7 +4,7 @@ BEGIN; -SELECT * +SELECT * INTO TABLE xacttest FROM aggtest; @@ -27,10 +27,10 @@ SELECT * FROM aggtest; ABORT; --- should not exist +-- should not exist SELECT oid FROM pg_class WHERE relname = 'disappear'; --- should have members again +-- should have members again SELECT * FROM aggtest; @@ -129,7 +129,7 @@ BEGIN; DELETE FROM savepoints WHERE a=2; ROLLBACK; COMMIT; -- should not be in a transaction block - + SELECT * FROM savepoints; -- test whole-tree commit on an aborted subtransaction diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql index a830b3b392..28928d5a93 100644 --- a/src/test/regress/sql/triggers.sql +++ b/src/test/regress/sql/triggers.sql @@ -23,25 +23,25 @@ create unique index pkeys_i on pkeys (pkey1, pkey2); -- (fkey1, fkey2) --> pkeys (pkey1, pkey2) -- (fkey3) --> fkeys2 (pkey23) -- -create trigger check_fkeys_pkey_exist - before insert or update on fkeys - for each row - execute procedure +create trigger check_fkeys_pkey_exist + before insert or update on fkeys + for each row + execute procedure check_primary_key ('fkey1', 'fkey2', 'pkeys', 'pkey1', 'pkey2'); -create trigger check_fkeys_pkey2_exist - before insert or update on fkeys - for each row +create trigger check_fkeys_pkey2_exist + before insert or update on fkeys + for each row execute procedure check_primary_key ('fkey3', 'fkeys2', 'pkey23'); -- -- For fkeys2: -- (fkey21, fkey22) --> pkeys (pkey1, pkey2) -- -create trigger check_fkeys2_pkey_exist - before insert or update on fkeys2 - for each row - execute procedure +create trigger check_fkeys2_pkey_exist + before insert or update on fkeys2 + for each row + execute procedure check_primary_key ('fkey21', 'fkey22', 'pkeys', 'pkey1', 'pkey2'); -- Test comments @@ -55,10 +55,10 @@ COMMENT ON TRIGGER check_fkeys2_pkey_exist ON fkeys2 IS NULL; -- fkeys (fkey1, fkey2) and fkeys2 (fkey21, fkey22) -- create trigger check_pkeys_fkey_cascade - before delete or update on pkeys - for each row - execute procedure - check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', + before delete or update on pkeys + for each row + execute procedure + check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', 'fkeys', 'fkey1', 'fkey2', 'fkeys2', 'fkey21', 'fkey22'); -- @@ -66,9 +66,9 @@ create trigger check_pkeys_fkey_cascade -- ON DELETE/UPDATE (pkey23) RESTRICT: -- fkeys (fkey3) -- -create trigger check_fkeys2_fkey_restrict +create trigger check_fkeys2_fkey_restrict before delete or update on fkeys2 - for each row + for each row execute procedure check_foreign_key (1, 'restrict', 'pkey23', 'fkeys', 'fkey3'); insert into fkeys2 values (10, '1', 1); @@ -103,53 +103,53 @@ DROP TABLE fkeys2; -- -- Jan -- -- create table dup17 (x int4); --- --- create trigger dup17_before +-- +-- create trigger dup17_before -- before insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; --- +-- -- insert into dup17 values (17); -- select count(*) from dup17; -- insert into dup17 values (17); -- select count(*) from dup17; --- +-- -- drop trigger dup17_before on dup17; --- +-- -- create trigger dup17_after -- after insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; --- +-- -- DROP TABLE dup17; create sequence ttdummy_seq increment 10 start 0 minvalue 0; create table tttest ( - price_id int4, - price_val int4, + price_id int4, + price_val int4, price_on int4, price_off int4 default 999999 ); -create trigger ttdummy +create trigger ttdummy before delete or update on tttest - for each row - execute procedure + for each row + execute procedure ttdummy (price_on, price_off); -create trigger ttserial +create trigger ttserial before insert or update on tttest - for each row - execute procedure + for each row + execute procedure autoinc (price_on, ttdummy_seq); insert into tttest values (1, 1, null); @@ -386,7 +386,7 @@ CREATE TABLE trigger_test ( v varchar ); -CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger +CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger LANGUAGE plpgsql AS $$ declare @@ -399,7 +399,7 @@ begin relid := TG_relid::regclass; -- plpgsql can't discover its trigger data in a hash like perl and python - -- can, or by a sort of reflection like tcl can, + -- can, or by a sort of reflection like tcl can, -- so we have to hard code the names. raise NOTICE 'TG_NAME: %', TG_name; raise NOTICE 'TG_WHEN: %', TG_when; @@ -438,16 +438,16 @@ begin end; $$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); insert into trigger_test values(1,'insert'); update trigger_test set v = 'update' where i = 1; delete from trigger_test; - + DROP TRIGGER show_trigger_data_trig on trigger_test; - + DROP FUNCTION trigger_data(); DROP TABLE trigger_test; @@ -547,11 +547,11 @@ INSERT INTO min_updates_test VALUES ('a',1,2),('b','2',null); INSERT INTO min_updates_test_oids VALUES ('a',1,2),('b','2',null); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test_oids FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); diff --git a/src/test/regress/sql/truncate.sql b/src/test/regress/sql/truncate.sql index a3e324db21..a3d6f5368f 100644 --- a/src/test/regress/sql/truncate.sql +++ b/src/test/regress/sql/truncate.sql @@ -148,7 +148,7 @@ INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER t BEFORE TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('before trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; @@ -166,7 +166,7 @@ INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER tt AFTER TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('after trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; diff --git a/src/test/regress/sql/tsdicts.sql b/src/test/regress/sql/tsdicts.sql index 000f6eb2e7..55afcec906 100644 --- a/src/test/regress/sql/tsdicts.sql +++ b/src/test/regress/sql/tsdicts.sql @@ -50,7 +50,7 @@ SELECT ts_lexize('hunspell', 'footballyklubber'); -- Synonim dictionary CREATE TEXT SEARCH DICTIONARY synonym ( - Template=synonym, + Template=synonym, Synonyms=synonym_sample ); @@ -63,7 +63,7 @@ SELECT ts_lexize('synonym', 'indices'); -- cannot pass more than one word to thesaurus. CREATE TEXT SEARCH DICTIONARY thesaurus ( Template=thesaurus, - DictFile=thesaurus_sample, + DictFile=thesaurus_sample, Dictionary=english_stem ); @@ -99,8 +99,8 @@ CREATE TEXT SEARCH CONFIGURATION synonym_tst ( COPY=english ); -ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, english_stem; SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre'); @@ -114,8 +114,8 @@ CREATE TEXT SEARCH CONFIGURATION thesaurus_tst ( COPY=synonym_tst ); -ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, thesaurus, english_stem; SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one'); diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql index 3c0a7dd82a..d261da2104 100644 --- a/src/test/regress/sql/tsearch.sql +++ b/src/test/regress/sql/tsearch.sql @@ -33,7 +33,7 @@ WHERE mapcfg = 0 OR mapdict = 0; -- Look for pg_ts_config_map entries that aren't one of parser's token types SELECT * FROM ( SELECT oid AS cfgid, (ts_token_type(cfgparser)).tokid AS tokid - FROM pg_ts_config ) AS tt + FROM pg_ts_config ) AS tt RIGHT JOIN pg_ts_config_map AS m ON (tt.cfgid=m.mapcfg AND tt.tokid=m.maptokentype) WHERE @@ -76,7 +76,7 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt'; SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)'; SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)'; SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*'; - + RESET enable_seqscan; INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH'); SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10; @@ -214,7 +214,7 @@ ff-bg </html>', to_tsquery('english', 'sea&foo'), 'HighlightAll=true'); ---Check if headline fragments work +--Check if headline fragments work SELECT ts_headline('english', ' Day after day, day after day, We stuck, nor breath nor motion, diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql index 479bf8542a..af7aa2d8b3 100644 --- a/src/test/regress/sql/type_sanity.sql +++ b/src/test/regress/sql/type_sanity.sql @@ -61,7 +61,7 @@ WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS p2.typelem = p1.oid and p1.typarray = p2.oid); -- Make sure typarray points to a varlena array type of our own base -SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, +SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, p2.typelem, p2.typlen FROM pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid) WHERE p1.typarray <> 0 AND diff --git a/src/test/regress/sql/varchar.sql b/src/test/regress/sql/varchar.sql index 414c585d9a..58d29ca4ba 100644 --- a/src/test/regress/sql/varchar.sql +++ b/src/test/regress/sql/varchar.sql @@ -8,17 +8,17 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql index 1cfc64bd8b..6a5c855ead 100644 --- a/src/test/regress/sql/window.sql +++ b/src/test/regress/sql/window.sql @@ -73,7 +73,7 @@ SELECT lead(ten * 2, 1, -1) OVER (PARTITION BY four ORDER BY ten), ten, four FRO SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; -- last_value returns the last row of the frame, which is CURRENT ROW in ORDER BY window. -SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; +SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; SELECT last_value(ten) OVER (PARTITION BY four), ten, four FROM (SELECT * FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten)s @@ -82,19 +82,19 @@ SELECT last_value(ten) OVER (PARTITION BY four), ten, four FROM SELECT nth_value(ten, four + 1) OVER (PARTITION BY four), ten, four FROM (SELECT * FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten)s; -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum FROM tenk1 GROUP BY ten, two; SELECT count(*) OVER (PARTITION BY four), four FROM (SELECT * FROM tenk1 WHERE two = 1)s WHERE unique2 < 10; -SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum +SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum FROM tenk1 WHERE unique2 < 10; -- opexpr with different windows evaluation. SELECT * FROM( - SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, + SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, count(*) OVER (PARTITION BY four ORDER BY ten) AS fourcount, sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS twosum FROM tenk1 @@ -103,7 +103,7 @@ WHERE total <> fourcount + twosum; SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) FROM tenk1 WHERE unique2 < 10; -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum FROM tenk1 GROUP BY ten, two WINDOW win AS (PARTITION BY two ORDER BY ten); -- more than one window with GROUP BY diff --git a/src/test/thread/README b/src/test/thread/README index 509f3dc24e..00ec2fff06 100644 --- a/src/test/thread/README +++ b/src/test/thread/README @@ -17,21 +17,21 @@ To use this program manually, you must: o compile and run this program If your platform requires special thread flags that are not tested by -/config/acx_pthread.m4, add PTHREAD_CFLAGS and PTHREAD_LIBS defines to +/config/acx_pthread.m4, add PTHREAD_CFLAGS and PTHREAD_LIBS defines to your template/${port} file. Windows Systems =============== Windows systems do not vary in their thread-safeness in the same way that -other systems might, nor do they generally have pthreads installed, hence -on Windows this test is skipped by the configure program (pthreads is +other systems might, nor do they generally have pthreads installed, hence +on Windows this test is skipped by the configure program (pthreads is required by the test program, but not PostgreSQL itself). If you do wish to test your system however, you can do so as follows: 1) Install pthreads in you Mingw/Msys environment. You can download pthreads from ftp://sources.redhat.com/pub/pthreads-win32/. - + 2) Build the test program: gcc -o thread_test.exe \ |