From 845f82e5413e37859223ba894c13e4780f355742 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 6 Jan 1998 19:25:19 +0000 Subject: [PATCH] Regression cleanup of WARN. --- src/test/regress/expected/errors.out | 4 +- src/test/regress/expected/geometry.out | 6 +- src/test/regress/expected/horology.out | 24 ++-- src/test/regress/expected/lseg.out | 6 +- src/test/regress/expected/triggers.out | 116 +++++++++--------- src/test/regress/output/constraints.source | 64 +++++----- .../regress/output/create_function_1.source | 2 +- src/test/regress/output/misc.source | 8 +- src/test/regress/regress.c | 38 +++--- 9 files changed, 134 insertions(+), 134 deletions(-) diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out index 54575c2662..8a6f154775 100644 --- a/src/test/regress/expected/errors.out +++ b/src/test/regress/expected/errors.out @@ -41,9 +41,9 @@ ERROR: renameatt: attribute "manager" exists QUERY: alter table emp rename column salary to oid; ERROR: renameatt: attribute "oid" exists QUERY: abort; -NOTICE:UserAbortTransactionBlock and not in in-progress state +NOTICE: UserAbortTransactionBlock and not in in-progress state QUERY: end; -NOTICE:EndTransactionBlock and not inprogress/abort state +NOTICE: EndTransactionBlock and not inprogress/abort state QUERY: create aggregate newavg1 (sfunc1 = int4pl, basetype = int4, stype1 = int4, diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out index 92eb7a7907..e8489597fd 100644 --- a/src/test/regress/expected/geometry.out +++ b/src/test/regress/expected/geometry.out @@ -87,9 +87,9 @@ one|f1 QUERY: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection FROM LSEG_TBL l, POINT_TBL p; -NOTICE:there is no operator # for types lseg and point -NOTICE:You will either have to retype this query using an -NOTICE:explicit cast, or you will have to define the operator +NOTICE: there is no operator # for types lseg and point +NOTICE: You will either have to retype this query using an +NOTICE: explicit cast, or you will have to define the operator ERROR: # for lseg and point using CREATE OPERATOR QUERY: SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest FROM LSEG_TBL l, POINT_TBL p; diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out index 65b459d35e..3803c84d6b 100644 --- a/src/test/regress/expected/horology.out +++ b/src/test/regress/expected/horology.out @@ -534,7 +534,7 @@ six|reltime |timespan QUERY: DROP TABLE TEMP_DATETIME; QUERY: SET DateStyle TO 'US,Postgres'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is Postgres with US (NonEuropean) conventions +NOTICE: DateStyle is Postgres with US (NonEuropean) conventions QUERY: SELECT '' AS sixty_two, d1 AS us_postgres FROM DATETIME_TBL; sixty_two|us_postgres ---------+------------------------------- @@ -698,7 +698,7 @@ eight|us_iso QUERY: SET DateStyle TO 'US,SQL'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is SQL with US (NonEuropean) conventions +NOTICE: DateStyle is SQL with US (NonEuropean) conventions QUERY: SELECT '' AS sixty_two, d1 AS us_sql FROM DATETIME_TBL; sixty_two|us_sql ---------+-------------------------- @@ -781,7 +781,7 @@ eight|us_sql QUERY: SET DateStyle TO 'European,Postgres'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is Postgres with European conventions +NOTICE: DateStyle is Postgres with European conventions QUERY: INSERT INTO DATETIME_TBL VALUES('13/06/1957'); QUERY: SELECT count(*) as one FROM DATETIME_TBL WHERE d1 = 'Jun 13 1957'; one @@ -872,7 +872,7 @@ eight|european_postgres QUERY: SET DateStyle TO 'European,ISO'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is ISO with European conventions +NOTICE: DateStyle is ISO with European conventions QUERY: SELECT '' AS sixty_three, d1 AS european_iso FROM DATETIME_TBL; sixty_three|european_iso -----------+------------------------- @@ -956,7 +956,7 @@ eight|european_iso QUERY: SET DateStyle TO 'European,SQL'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is SQL with European conventions +NOTICE: DateStyle is SQL with European conventions QUERY: SELECT '' AS sixty_three, d1 AS european_sql FROM DATETIME_TBL; sixty_three|european_sql -----------+-------------------------- @@ -1040,10 +1040,10 @@ eight|european_sql QUERY: RESET DateStyle; QUERY: SHOW DateStyle; -NOTICE:DateStyle is Postgres with US (NonEuropean) conventions +NOTICE: DateStyle is Postgres with US (NonEuropean) conventions QUERY: SET DateStyle TO 'US,Postgres'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is Postgres with US (NonEuropean) conventions +NOTICE: DateStyle is Postgres with US (NonEuropean) conventions QUERY: SELECT '' AS sixty_two, d1 AS us_postgres FROM DATETIME_TBL; sixty_two|us_postgres ---------+------------------------------- @@ -1209,7 +1209,7 @@ eight|us_iso QUERY: SET DateStyle TO 'US,SQL'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is SQL with US (NonEuropean) conventions +NOTICE: DateStyle is SQL with US (NonEuropean) conventions QUERY: SELECT '' AS sixty_two, d1 AS us_sql FROM DATETIME_TBL; sixty_two|us_sql ---------+-------------------------- @@ -1293,7 +1293,7 @@ eight|us_sql QUERY: SET DateStyle TO 'European,Postgres'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is Postgres with European conventions +NOTICE: DateStyle is Postgres with European conventions QUERY: INSERT INTO DATETIME_TBL VALUES('13/06/1957'); QUERY: SELECT count(*) as one FROM DATETIME_TBL WHERE d1 = 'Jun 13 1957'; one @@ -1385,7 +1385,7 @@ eight|european_postgres QUERY: SET DateStyle TO 'European,ISO'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is ISO with European conventions +NOTICE: DateStyle is ISO with European conventions QUERY: SELECT '' AS sixty_three, d1 AS european_iso FROM DATETIME_TBL; sixty_three|european_iso -----------+------------------------- @@ -1470,7 +1470,7 @@ eight|european_iso QUERY: SET DateStyle TO 'European,SQL'; QUERY: SHOW DateStyle; -NOTICE:DateStyle is SQL with European conventions +NOTICE: DateStyle is SQL with European conventions QUERY: SELECT '' AS sixty_three, d1 AS european_sql FROM DATETIME_TBL; sixty_three|european_sql -----------+-------------------------- @@ -1555,4 +1555,4 @@ eight|european_sql QUERY: RESET DateStyle; QUERY: SHOW DateStyle; -NOTICE:DateStyle is Postgres with US (NonEuropean) conventions +NOTICE: DateStyle is Postgres with US (NonEuropean) conventions diff --git a/src/test/regress/expected/lseg.out b/src/test/regress/expected/lseg.out index bf2e4a609f..69afc22539 100644 --- a/src/test/regress/expected/lseg.out +++ b/src/test/regress/expected/lseg.out @@ -23,9 +23,9 @@ s (5 rows) QUERY: SELECT * FROM LSEG_TBL WHERE s <= '[(1,2),(3,4)]'::lseg; -NOTICE:there is no operator <= for types lseg and lseg -NOTICE:You will either have to retype this query using an -NOTICE:explicit cast, or you will have to define the operator +NOTICE: there is no operator <= for types lseg and lseg +NOTICE: You will either have to retype this query using an +NOTICE: explicit cast, or you will have to define the operator ERROR: <= for lseg and lseg using CREATE OPERATOR QUERY: SELECT * FROM LSEG_TBL WHERE (s <-> '[(1,2),(3,4)]'::lseg) < 10; s diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index 8f754dc497..c4cf5b12b0 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -50,17 +50,17 @@ ERROR: check_fkeys_pkey_exist: tuple references non-existing key in pkeys QUERY: insert into fkeys values (60, '6', 4); ERROR: check_fkeys_pkey2_exist: tuple references non-existing key in fkeys2 QUERY: delete from pkeys where pkey1 = 30 and pkey2 = '3'; -NOTICE:check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys QUERY: delete from pkeys where pkey1 = 40 and pkey2 = '4'; -NOTICE:check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted -NOTICE:check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted QUERY: update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5'; -NOTICE:check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys QUERY: update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1'; -NOTICE:check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted -NOTICE:check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted +NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted QUERY: DROP TABLE pkeys; QUERY: DROP TABLE fkeys; QUERY: DROP TABLE fkeys2; @@ -72,7 +72,7 @@ QUERY: create trigger dup17_before funny_dup17 () ; QUERY: insert into dup17 values (17); -NOTICE:funny_dup17 (fired BEFORE) on level 1: 0/0 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 1: 0/0 tuples inserted/selected QUERY: select count(*) from dup17; count ----- @@ -80,23 +80,23 @@ count (1 row) QUERY: insert into dup17 values (17); -NOTICE:funny_dup17 (fired BEFORE) on level 17: 1/2 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 16: 1/3 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 15: 1/4 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 14: 1/5 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 13: 1/6 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 12: 1/7 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 11: 1/8 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 10: 1/9 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 9: 1/10 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 8: 1/11 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 7: 1/12 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 6: 1/13 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 5: 1/14 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 4: 1/15 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 3: 1/16 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 2: 1/17 tuples inserted/selected -NOTICE:funny_dup17 (fired BEFORE) on level 1: 1/18 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 17: 1/2 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 16: 1/3 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 15: 1/4 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 14: 1/5 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 13: 1/6 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 12: 1/7 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 11: 1/8 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 10: 1/9 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 9: 1/10 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 8: 1/11 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 7: 1/12 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 6: 1/13 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 5: 1/14 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 4: 1/15 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 3: 1/16 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 2: 1/17 tuples inserted/selected +NOTICE: funny_dup17 (fired BEFORE) on level 1: 1/18 tuples inserted/selected QUERY: select count(*) from dup17; count ----- @@ -111,23 +111,23 @@ QUERY: create trigger dup17_after funny_dup17 () ; QUERY: insert into dup17 values (13); -NOTICE:funny_dup17 (fired AFTER ) on level 17: 17/34 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 16: 16/49 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 15: 15/63 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 14: 14/76 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 13: 13/88 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 12: 12/99 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 11: 11/109 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 10: 10/118 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 9: 9/126 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 8: 8/133 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 7: 7/139 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 6: 6/144 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 5: 5/148 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 4: 4/151 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 3: 3/153 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 2: 2/154 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 1: 1/154 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 17: 17/34 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 16: 16/49 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 15: 15/63 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 14: 14/76 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 13: 13/88 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 12: 12/99 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 11: 11/109 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 10: 10/118 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 9: 9/126 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 8: 8/133 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 7: 7/139 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 6: 6/144 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 5: 5/148 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 4: 4/151 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 3: 3/153 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 2: 2/154 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 1: 1/154 tuples inserted/selected QUERY: select count(*) from dup17 where x = 13; count ----- @@ -135,23 +135,23 @@ count (1 row) QUERY: insert into dup17 values (13); -NOTICE:funny_dup17 (fired AFTER ) on level 17: 171/342 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 16: 170/511 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 15: 169/679 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 14: 168/846 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 13: 167/1012 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 12: 166/1177 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 11: 165/1341 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 10: 164/1504 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 9: 163/1666 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 8: 162/1827 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 7: 161/1987 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 6: 160/2146 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 5: 159/2304 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 4: 158/2461 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 3: 157/2617 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 2: 156/2772 tuples inserted/selected -NOTICE:funny_dup17 (fired AFTER ) on level 1: 155/2926 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 17: 171/342 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 16: 170/511 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 15: 169/679 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 14: 168/846 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 13: 167/1012 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 12: 166/1177 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 11: 165/1341 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 10: 164/1504 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 9: 163/1666 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 8: 162/1827 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 7: 161/1987 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 6: 160/2146 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 5: 159/2304 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 4: 158/2461 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 3: 157/2617 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 2: 156/2772 tuples inserted/selected +NOTICE: funny_dup17 (fired AFTER ) on level 1: 155/2926 tuples inserted/selected QUERY: select count(*) from dup17 where x = 13; count ----- diff --git a/src/test/regress/output/constraints.source b/src/test/regress/output/constraints.source index f99a2bfb0c..dc49b312dd 100644 --- a/src/test/regress/output/constraints.source +++ b/src/test/regress/output/constraints.source @@ -32,20 +32,20 @@ four| i1|i2 (4 rows) QUERY: CREATE TABLE error_tbl (i int DEFAULT (100, )); -WARN:parser: parse error at or near "," +ERROR: parser: parse error at or near "," QUERY: CREATE TABLE error_tbl (b1 bool DEFAULT 1 < 2); -WARN:boolean expressions not supported in DEFAULT +ERROR: boolean expressions not supported in DEFAULT QUERY: CREATE TABLE CHECK_TBL (x int, CONSTRAINT CHECK_CON CHECK (x > 3)); QUERY: INSERT INTO CHECK_TBL VALUES (5); QUERY: INSERT INTO CHECK_TBL VALUES (4); QUERY: INSERT INTO CHECK_TBL VALUES (3); -WARN:ExecAppend: rejected due to CHECK constraint check_con +ERROR: ExecAppend: rejected due to CHECK constraint check_con QUERY: INSERT INTO CHECK_TBL VALUES (2); -WARN:ExecAppend: rejected due to CHECK constraint check_con +ERROR: ExecAppend: rejected due to CHECK constraint check_con QUERY: INSERT INTO CHECK_TBL VALUES (6); QUERY: INSERT INTO CHECK_TBL VALUES (1); -WARN:ExecAppend: rejected due to CHECK constraint check_con +ERROR: ExecAppend: rejected due to CHECK constraint check_con QUERY: SELECT '' AS three, * FROM CHECK_TBL; three|x -----+- @@ -60,13 +60,13 @@ QUERY: CREATE TABLE CHECK2_TBL (x int, y text, z int, CHECK (x > 3 and y <> 'check failed' and z < 8)); QUERY: INSERT INTO CHECK2_TBL VALUES (4, 'check ok', -2); QUERY: INSERT INTO CHECK2_TBL VALUES (1, 'x check failed', -2); -WARN:ExecAppend: rejected due to CHECK constraint sequence_con +ERROR: ExecAppend: rejected due to CHECK constraint sequence_con QUERY: INSERT INTO CHECK2_TBL VALUES (5, 'z check failed', 10); -WARN:ExecAppend: rejected due to CHECK constraint sequence_con +ERROR: ExecAppend: rejected due to CHECK constraint sequence_con QUERY: INSERT INTO CHECK2_TBL VALUES (0, 'check failed', -2); -WARN:ExecAppend: rejected due to CHECK constraint sequence_con +ERROR: ExecAppend: rejected due to CHECK constraint sequence_con QUERY: INSERT INTO CHECK2_TBL VALUES (6, 'check failed', 11); -WARN:ExecAppend: rejected due to CHECK constraint sequence_con +ERROR: ExecAppend: rejected due to CHECK constraint sequence_con QUERY: INSERT INTO CHECK2_TBL VALUES (7, 'check ok', 7); QUERY: SELECT '' AS two, * from CHECK2_TBL; two|x|y | z @@ -81,9 +81,9 @@ QUERY: CREATE TABLE INSERT_TBL (x INT DEFAULT nextval('insert_seq'), CONSTRAINT INSERT_CON CHECK (x >= 3 AND y <> 'check failed' AND x < 8), CHECK (x + z = 0)); QUERY: INSERT INTO INSERT_TBL VALUES (null, null, null); -WARN:ExecAppend: rejected due to CHECK constraint $2 +ERROR: ExecAppend: rejected due to CHECK constraint $2 QUERY: INSERT INTO INSERT_TBL(x,z) VALUES (2, -2); -WARN:ExecAppend: rejected due to CHECK constraint insert_con +ERROR: ExecAppend: rejected due to CHECK constraint insert_con QUERY: SELECT '' AS zero, * FROM INSERT_TBL; zero|x|y|z ----+-+-+- @@ -96,13 +96,13 @@ one| 1 (1 row) QUERY: INSERT INTO INSERT_TBL(y) VALUES ('Y'); -WARN:ExecAppend: rejected due to CHECK constraint insert_con +ERROR: ExecAppend: rejected due to CHECK constraint insert_con QUERY: INSERT INTO INSERT_TBL(y) VALUES ('Y'); QUERY: INSERT INTO INSERT_TBL(x,z) VALUES (1, -2); -WARN:ExecAppend: rejected due to CHECK constraint $2 +ERROR: ExecAppend: rejected due to CHECK constraint $2 QUERY: INSERT INTO INSERT_TBL(z,x) VALUES (-7, 7); QUERY: INSERT INTO INSERT_TBL VALUES (5, 'check failed', -5); -WARN:ExecAppend: rejected due to CHECK constraint insert_con +ERROR: ExecAppend: rejected due to CHECK constraint insert_con QUERY: INSERT INTO INSERT_TBL VALUES (7, '!check failed', -7); QUERY: INSERT INTO INSERT_TBL(y) VALUES ('-!NULL-'); QUERY: SELECT '' AS four, * FROM INSERT_TBL; @@ -115,9 +115,9 @@ four|x|y | z (4 rows) QUERY: INSERT INTO INSERT_TBL(y,z) VALUES ('check failed', 4); -WARN:ExecAppend: rejected due to CHECK constraint $2 +ERROR: ExecAppend: rejected due to CHECK constraint $2 QUERY: INSERT INTO INSERT_TBL(x,y) VALUES (5, 'check failed'); -WARN:ExecAppend: rejected due to CHECK constraint insert_con +ERROR: ExecAppend: rejected due to CHECK constraint insert_con QUERY: INSERT INTO INSERT_TBL(x,y) VALUES (5, '!check failed'); QUERY: INSERT INTO INSERT_TBL(y) VALUES ('-!NULL-'); QUERY: SELECT '' AS six, * FROM INSERT_TBL; @@ -138,7 +138,7 @@ seven| 7 (1 row) QUERY: INSERT INTO INSERT_TBL(y) VALUES ('Y'); -WARN:ExecAppend: rejected due to CHECK constraint insert_con +ERROR: ExecAppend: rejected due to CHECK constraint insert_con QUERY: SELECT 'eight' AS one, currval('insert_seq'); one |currval -----+------- @@ -153,7 +153,7 @@ QUERY: INSERT INTO TEMP VALUES (null, 'Y', null); QUERY: INSERT INTO TEMP VALUES (5, '!check failed', null); QUERY: INSERT INTO TEMP VALUES (null, 'try again', null); QUERY: INSERT INTO INSERT_TBL(y) select yd from TEMP; -NOTICE:insert_seq.nextval: sequence was re-created +NOTICE: insert_seq.nextval: sequence was re-created QUERY: SELECT '' AS three, * FROM INSERT_TBL; three|x|y | z -----+-+-------------+-- @@ -163,10 +163,10 @@ three|x|y | z (3 rows) QUERY: INSERT INTO INSERT_TBL SELECT * FROM TEMP WHERE yd = 'try again'; -WARN:ExecAppend: rejected due to CHECK constraint $2 +ERROR: ExecAppend: rejected due to CHECK constraint $2 QUERY: INSERT INTO INSERT_TBL(y,z) SELECT yd, -7 FROM TEMP WHERE yd = 'try again'; QUERY: INSERT INTO INSERT_TBL(y,z) SELECT yd, -8 FROM TEMP WHERE yd = 'try again'; -WARN:ExecAppend: rejected due to CHECK constraint insert_con +ERROR: ExecAppend: rejected due to CHECK constraint insert_con QUERY: SELECT '' AS four, * FROM INSERT_TBL; four|x|y | z ----+-+-------------+-- @@ -178,11 +178,11 @@ four|x|y | z QUERY: DROP TABLE TEMP; QUERY: UPDATE INSERT_TBL SET x = NULL WHERE x = 6; -WARN:ExecReplace: rejected due to CHECK constraint $2 +ERROR: ExecReplace: rejected due to CHECK constraint $2 QUERY: UPDATE INSERT_TBL SET x = 6 WHERE x = 6; QUERY: UPDATE INSERT_TBL SET x = -z, z = -x; QUERY: UPDATE INSERT_TBL SET x = z, z = x; -WARN:ExecReplace: rejected due to CHECK constraint insert_con +ERROR: ExecReplace: rejected due to CHECK constraint insert_con QUERY: SELECT * FROM INSERT_TBL; x|y | z -+-------------+-- @@ -204,7 +204,7 @@ two|x|y |z (2 rows) QUERY: COPY COPY_TBL FROM '_OBJWD_/data/constrf.data'; -WARN:CopyFrom: rejected due to CHECK constraint copy_con +ERROR: CopyFrom: rejected due to CHECK constraint copy_con QUERY: SELECT * FROM COPY_TBL; x|y |z -+-------------+- @@ -213,15 +213,15 @@ x|y |z (2 rows) QUERY: CREATE TABLE PRIMARY_TBL (i int PRIMARY KEY, t text); -NOTICE:CREATE TABLE/PRIMARY KEY will create implicit index primary_tbl_pkey for table primary_tbl +NOTICE: CREATE TABLE/PRIMARY KEY will create implicit index primary_tbl_pkey for table primary_tbl QUERY: INSERT INTO PRIMARY_TBL VALUES (1, 'one'); QUERY: INSERT INTO PRIMARY_TBL VALUES (2, 'two'); QUERY: INSERT INTO PRIMARY_TBL VALUES (1, 'three'); -WARN:Cannot insert a duplicate key into a unique index +ERROR: Cannot insert a duplicate key into a unique index QUERY: INSERT INTO PRIMARY_TBL VALUES (4, 'three'); QUERY: INSERT INTO PRIMARY_TBL VALUES (5, 'one'); QUERY: INSERT INTO PRIMARY_TBL (t) VALUES ('six'); -WARN:ExecAppend: Fail to add null value in not null attribute i +ERROR: ExecAppend: Fail to add null value in not null attribute i QUERY: SELECT '' AS four, * FROM PRIMARY_TBL; four|i|t ----+-+----- @@ -234,14 +234,14 @@ four|i|t QUERY: DROP TABLE PRIMARY_TBL; QUERY: CREATE TABLE PRIMARY_TBL (i int, t text, PRIMARY KEY(i,t)); -NOTICE:CREATE TABLE/PRIMARY KEY will create implicit index primary_tbl_pkey for table primary_tbl +NOTICE: CREATE TABLE/PRIMARY KEY will create implicit index primary_tbl_pkey for table primary_tbl QUERY: INSERT INTO PRIMARY_TBL VALUES (1, 'one'); QUERY: INSERT INTO PRIMARY_TBL VALUES (2, 'two'); QUERY: INSERT INTO PRIMARY_TBL VALUES (1, 'three'); QUERY: INSERT INTO PRIMARY_TBL VALUES (4, 'three'); QUERY: INSERT INTO PRIMARY_TBL VALUES (5, 'one'); QUERY: INSERT INTO PRIMARY_TBL (t) VALUES ('six'); -WARN:ExecAppend: Fail to add null value in not null attribute i +ERROR: ExecAppend: Fail to add null value in not null attribute i QUERY: SELECT '' AS three, * FROM PRIMARY_TBL; three|i|t -----+-+----- @@ -254,11 +254,11 @@ three|i|t QUERY: DROP TABLE PRIMARY_TBL; QUERY: CREATE TABLE UNIQUE_TBL (i int UNIQUE, t text); -NOTICE:CREATE TABLE/UNIQUE will create implicit index unique_tbl_i_key for table unique_tbl +NOTICE: CREATE TABLE/UNIQUE will create implicit index unique_tbl_i_key for table unique_tbl QUERY: INSERT INTO UNIQUE_TBL VALUES (1, 'one'); QUERY: INSERT INTO UNIQUE_TBL VALUES (2, 'two'); QUERY: INSERT INTO UNIQUE_TBL VALUES (1, 'three'); -WARN:Cannot insert a duplicate key into a unique index +ERROR: Cannot insert a duplicate key into a unique index QUERY: INSERT INTO UNIQUE_TBL VALUES (4, 'four'); QUERY: INSERT INTO UNIQUE_TBL VALUES (5, 'one'); QUERY: INSERT INTO UNIQUE_TBL (t) VALUES ('six'); @@ -277,12 +277,12 @@ five|i|t QUERY: DROP TABLE UNIQUE_TBL; QUERY: CREATE TABLE UNIQUE_TBL (i int, t text, UNIQUE(i,t)); -NOTICE:CREATE TABLE/UNIQUE will create implicit index unique_tbl_i_key for table unique_tbl +NOTICE: CREATE TABLE/UNIQUE will create implicit index unique_tbl_i_key for table unique_tbl QUERY: INSERT INTO UNIQUE_TBL VALUES (1, 'one'); QUERY: INSERT INTO UNIQUE_TBL VALUES (2, 'two'); QUERY: INSERT INTO UNIQUE_TBL VALUES (1, 'three'); QUERY: INSERT INTO UNIQUE_TBL VALUES (1, 'one'); -WARN:Cannot insert a duplicate key into a unique index +ERROR: Cannot insert a duplicate key into a unique index QUERY: INSERT INTO UNIQUE_TBL VALUES (5, 'one'); QUERY: INSERT INTO UNIQUE_TBL (t) VALUES ('six'); QUERY: SELECT '' AS five, * FROM UNIQUE_TBL; diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source index 56b065f219..8fc21fe840 100644 --- a/src/test/regress/output/create_function_1.source +++ b/src/test/regress/output/create_function_1.source @@ -2,7 +2,7 @@ QUERY: CREATE FUNCTION widget_in(opaque) RETURNS widget AS '_OBJWD_/regress_DLSUFFIX_' LANGUAGE 'c'; -NOTICE:ProcedureCreate: type 'widget' is not yet defined +NOTICE: ProcedureCreate: type 'widget' is not yet defined QUERY: CREATE FUNCTION widget_out(opaque) RETURNS opaque AS '_OBJWD_/regress_DLSUFFIX_' diff --git a/src/test/regress/output/misc.source b/src/test/regress/output/misc.source index ae120c61b7..fc723347bf 100644 --- a/src/test/regress/output/misc.source +++ b/src/test/regress/output/misc.source @@ -6,14 +6,14 @@ QUERY: UPDATE temp SET stringu1 = reverse_c16(onek.stringu1) WHERE onek.stringu1 = 'JBAAAA' and onek.stringu1 = temp.stringu1; -NOTICE:Non-functional update, only first update is performed -NOTICE:Non-functional update, only first update is performed +NOTICE: Non-functional update, only first update is performed +NOTICE: Non-functional update, only first update is performed QUERY: UPDATE temp SET stringu1 = reverse_c16(onek2.stringu1) WHERE onek2.stringu1 = 'JCAAAA' and onek2.stringu1 = temp.stringu1; -NOTICE:Non-functional update, only first update is performed -NOTICE:Non-functional update, only first update is performed +NOTICE: Non-functional update, only first update is performed +NOTICE: Non-functional update, only first update is performed QUERY: DROP TABLE temp; QUERY: COPY onek TO '_OBJWD_/results/onek.data'; QUERY: DELETE FROM onek; diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 50f10bf8e8..0ba658f800 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.19 1998/01/06 18:53:02 momjian Exp $ + * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.20 1998/01/06 19:24:52 momjian Exp $ */ #include /* faked on sunos */ @@ -372,7 +372,7 @@ funny_dup17() SPI_gettype(tupdesc, 1)); if ((ret = SPI_exec(sql, 0)) < 0) - elog(ABORT, "funny_dup17 (fired %s) on level %3d: SPI_exec (insert ...) returned %d", + elog(ERROR, "funny_dup17 (fired %s) on level %3d: SPI_exec (insert ...) returned %d", when, *level, ret); inserted = SPI_processed; @@ -384,7 +384,7 @@ funny_dup17() SPI_gettype(tupdesc, 1)); if ((ret = SPI_exec(sql, 0)) < 0) - elog(ABORT, "funny_dup17 (fired %s) on level %3d: SPI_exec (select ...) returned %d", + elog(ERROR, "funny_dup17 (fired %s) on level %3d: SPI_exec (select ...) returned %d", when, *level, ret); if (SPI_processed > 0) @@ -444,13 +444,13 @@ ttdummy() int i; if (!CurrentTriggerData) - elog(ABORT, "ttdummy: triggers are not initialized"); + elog(ERROR, "ttdummy: triggers are not initialized"); if (TRIGGER_FIRED_FOR_STATEMENT(CurrentTriggerData->tg_event)) - elog(ABORT, "ttdummy: can't process STATEMENT events"); + elog(ERROR, "ttdummy: can't process STATEMENT events"); if (TRIGGER_FIRED_AFTER(CurrentTriggerData->tg_event)) - elog(ABORT, "ttdummy: must be fired before event"); + elog(ERROR, "ttdummy: must be fired before event"); if (TRIGGER_FIRED_BY_INSERT(CurrentTriggerData->tg_event)) - elog (ABORT, "ttdummy: can't process INSERT event"); + elog (ERROR, "ttdummy: can't process INSERT event"); if (TRIGGER_FIRED_BY_UPDATE(CurrentTriggerData->tg_event)) newtuple = CurrentTriggerData->tg_newtuple; @@ -469,7 +469,7 @@ ttdummy() trigger = CurrentTriggerData->tg_trigger; if (trigger->tgnargs != 2) - elog(ABORT, "ttdummy (%s): invalid (!= 2) number of arguments %d", + elog(ERROR, "ttdummy (%s): invalid (!= 2) number of arguments %d", relname, trigger->tgnargs); args = trigger->tgargs; @@ -482,31 +482,31 @@ ttdummy() { attnum[i] = SPI_fnumber (tupdesc, args[i]); if ( attnum[i] < 0 ) - elog(ABORT, "ttdummy (%s): there is no attribute %s", relname, args[i]); + elog(ERROR, "ttdummy (%s): there is no attribute %s", relname, args[i]); if (SPI_gettypeid (tupdesc, attnum[i]) != INT4OID) - elog(ABORT, "ttdummy (%s): attributes %s and %s must be of abstime type", + elog(ERROR, "ttdummy (%s): attributes %s and %s must be of abstime type", relname, args[0], args[1]); } oldon = SPI_getbinval (trigtuple, tupdesc, attnum[0], &isnull); if (isnull) - elog(ABORT, "ttdummy (%s): %s must be NOT NULL", relname, args[0]); + elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[0]); oldoff = SPI_getbinval (trigtuple, tupdesc, attnum[1], &isnull); if (isnull) - elog(ABORT, "ttdummy (%s): %s must be NOT NULL", relname, args[1]); + elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]); if (newtuple != NULL) /* UPDATE */ { newon = SPI_getbinval (newtuple, tupdesc, attnum[0], &isnull); if (isnull) - elog(ABORT, "ttdummy (%s): %s must be NOT NULL", relname, args[0]); + elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[0]); newoff = SPI_getbinval (newtuple, tupdesc, attnum[1], &isnull); if (isnull) - elog(ABORT, "ttdummy (%s): %s must be NOT NULL", relname, args[1]); + elog(ERROR, "ttdummy (%s): %s must be NOT NULL", relname, args[1]); if ( oldon != newon || oldoff != newoff ) - elog (ABORT, "ttdummy (%s): you can't change %s and/or %s columns (use set_ttdummy)", + elog (ERROR, "ttdummy (%s): you can't change %s and/or %s columns (use set_ttdummy)", relname, args[0], args[1]); if ( newoff != TTDUMMY_INFINITY ) @@ -530,7 +530,7 @@ ttdummy() /* Connect to SPI manager */ if ((ret = SPI_connect()) < 0) - elog(ABORT, "ttdummy (%s): SPI_connect returned %d", relname, ret); + elog(ERROR, "ttdummy (%s): SPI_connect returned %d", relname, ret); /* Fetch tuple values and nulls */ cvals = (Datum *) palloc (natts * sizeof (Datum)); @@ -581,11 +581,11 @@ ttdummy() /* Prepare plan for query */ pplan = SPI_prepare(sql, natts, ctypes); if (pplan == NULL) - elog(ABORT, "ttdummy (%s): SPI_prepare returned %d", relname, SPI_result); + elog(ERROR, "ttdummy (%s): SPI_prepare returned %d", relname, SPI_result); pplan = SPI_saveplan(pplan); if (pplan == NULL) - elog(ABORT, "ttdummy (%s): SPI_saveplan returned %d", relname, SPI_result); + elog(ERROR, "ttdummy (%s): SPI_saveplan returned %d", relname, SPI_result); splan = pplan; } @@ -593,7 +593,7 @@ ttdummy() ret = SPI_execp(splan, cvals, cnulls, 0); if (ret < 0) - elog(ABORT, "ttdummy (%s): SPI_execp returned %d", relname, ret); + elog(ERROR, "ttdummy (%s): SPI_execp returned %d", relname, ret); /* Tuple to return to upper Executor ... */ if (newtuple) /* UPDATE */ -- GitLab