Update error messages with more consistant format.

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 62538fc78ec91b03535336af786dad2332e90bfc..1c244df734f078a55629f664e6a4f51cabb4a563 100644 (file)
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -10,7 +10,7 @@ QUERY: ALTER TABLE tmp ADD COLUMN h abstime;
 QUERY: ALTER TABLE tmp ADD COLUMN i char;
 QUERY: ALTER TABLE tmp ADD COLUMN j abstime[];
 QUERY: ALTER TABLE tmp ADD COLUMN k dt;
-ERROR: type name lookup of dt failed
+ERROR:  Unable to locate type name 'dt' in catalog
 QUERY: ALTER TABLE tmp ADD COLUMN l tid;
 QUERY: ALTER TABLE tmp ADD COLUMN m xid;
 QUERY: ALTER TABLE tmp ADD COLUMN n oid8;
@@ -33,7 +33,7 @@ QUERY: INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t,
        '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)', '["current" "infinity"]',
        '1/3', '1,name', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
-ERROR: Relation tmp does not have attribute k
+ERROR:  Relation 'tmp' does not have attribute 'k'
 QUERY: SELECT * FROM tmp;
 initial|a|b|c|d|e|f|g|h|i|j|l|m|n|p|q|r|s|t|u|v|w|x|y|z
 -------+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
@@ -54,7 +54,7 @@ QUERY: ALTER TABLE tmp ADD COLUMN h abstime;
 QUERY: ALTER TABLE tmp ADD COLUMN i char;
 QUERY: ALTER TABLE tmp ADD COLUMN j abstime[];
 QUERY: ALTER TABLE tmp ADD COLUMN k dt;
-ERROR: type name lookup of dt failed
+ERROR:  Unable to locate type name 'dt' in catalog
 QUERY: ALTER TABLE tmp ADD COLUMN l tid;
 QUERY: ALTER TABLE tmp ADD COLUMN m xid;
 QUERY: ALTER TABLE tmp ADD COLUMN n oid8;
@@ -77,7 +77,7 @@ QUERY: INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t,
        '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)', '["current" "infinity"]',
        '1/3', '1,name', '{1.0,2.0,3.0,4.0}', '{1.0,2.0,3.0,4.0}', '{1,2,3,4}');
-ERROR: Relation tmp does not have attribute k
+ERROR:  Relation 'tmp' does not have attribute 'k'
 QUERY: SELECT * FROM tmp;
 initial|a|b|c|d|e|f|g|h|i|j|l|m|n|p|q|r|s|t|u|v|w|x|y|z
 -------+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-

diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out
index 837056caef928f1132455fbf445b4bf0d9756e71..d94f3e478a874913d927a13ee8bef109ef7a7454 100644 (file)
--- a/src/test/regress/expected/errors.out
+++ b/src/test/regress/expected/errors.out
@@ -19,7 +19,7 @@ ERROR:  nonesuch: Table does not exist.
 QUERY: drop table;
 ERROR:  parser: parse error at or near ";"
 QUERY: drop table nonesuch;
-ERROR:  Relation nonesuch Does Not Exist!
+ERROR:  Relation 'nonesuch' does not exist
 QUERY: alter table rename;
 ERROR:  parser: parse error at or near ";"
 QUERY: alter table nonesuch rename to newnonesuch;

diff --git a/src/test/regress/expected/inet.out b/src/test/regress/expected/inet.out
index dddc7d371f45ef7a6fd455310ff877137f534e2c..bf69014ad94b6c78b594ddf26c445f49ec3e2f2c 100644 (file)
--- a/src/test/regress/expected/inet.out
+++ b/src/test/regress/expected/inet.out
@@ -1,5 +1,5 @@
 QUERY: DROP TABLE INET_TBL;
-ERROR:  Relation inet_tbl Does Not Exist!
+ERROR:  Relation 'inet_tbl' does not exist
 QUERY: CREATE TABLE INET_TBL (c cidr, i inet);
 QUERY: INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.226/24');
 QUERY: INSERT INTO INET_TBL (c, i) VALUES ('192.168.1.2/24', '192.168.1.226');

diff --git a/src/test/regress/expected/select_implicit.out b/src/test/regress/expected/select_implicit.out
index 2ee8b0482239d3611aab922ca451dfade535a4c8..910bf221de42313e7b520f3a33c4d9e0101f9504 100644 (file)
--- a/src/test/regress/expected/select_implicit.out
+++ b/src/test/regress/expected/select_implicit.out
@@ -98,7 +98,7 @@ ERROR:  GROUP BY position 3 is not in target list
 QUERY: SELECT count(*) FROM test_missing_target x, test_missing_target y
        WHERE x.a = y.a
        GROUP BY b ORDER BY b;
-ERROR:  Column b is ambiguous
+ERROR:  Column 'b' is ambiguous
 QUERY: SELECT a, a FROM test_missing_target
        ORDER BY a;
 a|a
@@ -236,7 +236,7 @@ count
 QUERY: 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 b is ambiguous
+ERROR:  Column 'b' is ambiguous
 QUERY: 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;
@@ -250,7 +250,7 @@ QUERY: SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target
 QUERY: SELECT count(b) FROM test_missing_target x, test_missing_target y
        WHERE x.a = y.a
        GROUP BY x.b/2;
-ERROR:  Column b is ambiguous
+ERROR:  Column 'b' is ambiguous
 QUERY: SELECT count(x.b) INTO TABLE test_missing_target3
 FROM test_missing_target x, test_missing_target y
        WHERE x.a = y.a