Fix collateral damage from error message cleanup.

diff --git a/src/test/regress/expected/horology-no-DST-before-1970.out b/src/test/regress/expected/horology-no-DST-before-1970.out
index f71b6a9821e8133804b052f956042af6ed93ba44..44548ac8131a7005fd4a7c8da78d0314c05744f4 100644 (file)
--- a/src/test/regress/expected/horology-no-DST-before-1970.out
+++ b/src/test/regress/expected/horology-no-DST-before-1970.out
@@ -43,7 +43,7 @@ SELECT date '1991-02-03' - time '04:05:06' AS "Subtract Time";
 (1 row)
 
 SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time UTC";
-ERROR:  Unable to identify an operator '-' for types 'date' and 'timetz'
+ERROR:  Unable to identify an operator '-' for types 'date' and 'time with time zone'
        You will have to retype this query using an explicit cast
 --
 -- timestamp, interval arithmetic
@@ -118,9 +118,9 @@ SELECT interval '04:30' - time '01:02' AS "+03:28";
 (1 row)
 
 SELECT CAST(time with time zone '01:02-08' AS interval) AS "+00:01";
-ERROR:  Cannot cast type 'timetz' to 'interval'
+ERROR:  Cannot cast type 'time with time zone' to 'interval'
 SELECT CAST(interval '02:03' AS time with time zone) AS "02:03:00-08";
-ERROR:  Cannot cast type 'interval' to 'timetz'
+ERROR:  Cannot cast type 'interval' to 'time with time zone'
 SELECT time with time zone '01:30-08' - interval '02:01' AS "23:29:00-08";
  23:29:00-08 
 -------------
@@ -153,7 +153,7 @@ SELECT CAST(date 'today' + time with time zone '03:30'
 (1 row)
 
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
-ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
+ERROR:  Unable to identify an operator '-' for types 'interval' and 'time with time zone'
        You will have to retype this query using an explicit cast
 -- We get 100 rows when run in GMT...
 SELECT t.d1 + i.f1 AS "102" FROM TIMESTAMP_TBL t, INTERVAL_TBL i

diff --git a/src/test/regress/expected/horology-solaris-1947.out b/src/test/regress/expected/horology-solaris-1947.out
index 99313d4cb4ca1a548323c67924ec5760a09566d0..dd5ff231e0c60e2b2b34cfec0e7315b4e785b0b8 100644 (file)
--- a/src/test/regress/expected/horology-solaris-1947.out
+++ b/src/test/regress/expected/horology-solaris-1947.out
@@ -43,7 +43,7 @@ SELECT date '1991-02-03' - time '04:05:06' AS "Subtract Time";
 (1 row)
 
 SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time UTC";
-ERROR:  Unable to identify an operator '-' for types 'date' and 'timetz'
+ERROR:  Unable to identify an operator '-' for types 'date' and 'time with time zone'
        You will have to retype this query using an explicit cast
 --
 -- timestamp, interval arithmetic
@@ -118,9 +118,9 @@ SELECT interval '04:30' - time '01:02' AS "+03:28";
 (1 row)
 
 SELECT CAST(time with time zone '01:02-08' AS interval) AS "+00:01";
-ERROR:  Cannot cast type 'timetz' to 'interval'
+ERROR:  Cannot cast type 'time with time zone' to 'interval'
 SELECT CAST(interval '02:03' AS time with time zone) AS "02:03:00-08";
-ERROR:  Cannot cast type 'interval' to 'timetz'
+ERROR:  Cannot cast type 'interval' to 'time with time zone'
 SELECT time with time zone '01:30-08' - interval '02:01' AS "23:29:00-08";
  23:29:00-08 
 -------------
@@ -153,7 +153,7 @@ SELECT CAST(date 'today' + time with time zone '03:30'
 (1 row)
 
 SELECT interval '04:30' - time with time zone '01:02' AS "+03:28";
-ERROR:  Unable to identify an operator '-' for types 'interval' and 'timetz'
+ERROR:  Unable to identify an operator '-' for types 'interval' and 'time with time zone'
        You will have to retype this query using an explicit cast
 -- We get 100 rows when run in GMT...
 SELECT t.d1 + i.f1 AS "102" FROM TIMESTAMP_TBL t, INTERVAL_TBL i

diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source
index d075a61eb8a4df8f9485250acbd431a4e87fee34..92183d18b306bfe2666a13344b83065b507ad490 100644 (file)
--- a/src/test/regress/output/create_function_1.source
+++ b/src/test/regress/output/create_function_1.source
@@ -5,7 +5,7 @@ CREATE FUNCTION widget_in(opaque)
    RETURNS widget
    AS '@abs_builddir@/regress@DLSUFFIX@'
    LANGUAGE 'c';
-NOTICE:  ProcedureCreate: type 'widget' is not yet defined
+NOTICE:  ProcedureCreate: type widget is not yet defined
 CREATE FUNCTION widget_out(opaque)
    RETURNS opaque
    AS '@abs_builddir@/regress@DLSUFFIX@'