From d70df16a76603e806e32e68da85c8fd8fc13cc5a Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Sat, 10 Jan 1998 17:50:49 +0000
Subject: [PATCH] Fix up for recent changes in elog error messages. Some
behavior of the triggers test cases changed for the least week or two; now
back to the usual expected behavior.
---
src/test/regress/expected/geometry.out | 7 +++----
src/test/regress/expected/lseg.out | 7 +++----
src/test/regress/expected/triggers.out | 8 +++-----
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index e8489597fd8..a423ae314e0 100644
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -87,10 +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
-ERROR: # for lseg and point using CREATE OPERATOR
+ERROR: There is no operator '#' for types 'lseg' and 'point'
+ You will either have to retype this query using an explicit cast,
+ or you will have to define the operator using CREATE OPERATOR
QUERY: SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
FROM LSEG_TBL l, POINT_TBL p;
thirty|f1 |s |closest
diff --git a/src/test/regress/expected/lseg.out b/src/test/regress/expected/lseg.out
index 69afc225397..b21d7a294a0 100644
--- a/src/test/regress/expected/lseg.out
+++ b/src/test/regress/expected/lseg.out
@@ -23,10 +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
-ERROR: <= for lseg and lseg using CREATE OPERATOR
+ERROR: There is no operator '<=' for types 'lseg' and 'lseg'
+ You will either have to retype this query using an explicit cast,
+ or you will have to define the operator 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 c4cf5b12b0f..17a17d34c35 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -40,27 +40,25 @@ QUERY: insert into fkeys2 values (30, '3', 2);
QUERY: insert into fkeys2 values (40, '4', 5);
QUERY: insert into fkeys2 values (50, '5', 3);
QUERY: insert into fkeys2 values (70, '5', 3);
-ERROR: check_fkeys2_pkey_exist: tuple references non-existing key in pkeys
QUERY: insert into fkeys values (10, '1', 2);
QUERY: insert into fkeys values (30, '3', 3);
QUERY: insert into fkeys values (40, '4', 2);
QUERY: insert into fkeys values (50, '5', 2);
QUERY: insert into fkeys values (70, '5', 1);
-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
-ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys
+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted
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
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
-ERROR: check_fkeys2_fkey_restrict: tuple referenced in fkeys
+NOTICE: check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted
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
+ERROR: Cannot insert a duplicate key into a unique index
QUERY: DROP TABLE pkeys;
QUERY: DROP TABLE fkeys;
QUERY: DROP TABLE fkeys2;
--
GitLab