Remove the datetime keywords ABSTIME and RELTIME, which we'd been treating as

noise words for the last twelve years, for compatibility with Berkeley-era
output formatting of the special INVALID values for those datatypes.
Considering that the datatypes themselves have been deprecated for awhile,
this is taking backwards compatibility a little far.  Per gripe from Josh
Berkus.

4 files changed, 10 insertions, 20 deletions

diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out
index 7646f1aee2..d99c110724 100644
--- a/src/test/regress/expected/timestamp.out
+++ b/src/test/regress/expected/timestamp.out
@@ -84,20 +84,16 @@ INSERT INTO TIMESTAMP_TBL VALUES ('invalid');
 ERROR:  date/time value "invalid" is no longer supported
 LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('invalid');
                                           ^
+INSERT INTO TIMESTAMP_TBL VALUES ('undefined');
+ERROR:  date/time value "undefined" is no longer supported
+LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('undefined');
+                                          ^
 INSERT INTO TIMESTAMP_TBL VALUES ('current');
 ERROR:  date/time value "current" is no longer supported
 LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('current');
                                           ^
 -- Postgres v6.0 standard output format
 INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01 1997 PST');
-INSERT INTO TIMESTAMP_TBL VALUES ('Invalid Abstime');
-ERROR:  date/time value "Invalid Abstime" is no longer supported
-LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('Invalid Abstime');
-                                          ^
-INSERT INTO TIMESTAMP_TBL VALUES ('Undefined Abstime');
-ERROR:  date/time value "Undefined Abstime" is no longer supported
-LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('Undefined Abstime');
-                                          ^
 -- Variations on Postgres v6.1 standard output format
 INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01.000001 1997 PST');
 INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01.999999 1997 PST');
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 7b12a2c2c8..f35bb14d35 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -83,20 +83,16 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('invalid');
 ERROR:  date/time value "invalid" is no longer supported
 LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('invalid');
                                             ^
+INSERT INTO TIMESTAMPTZ_TBL VALUES ('undefined');
+ERROR:  date/time value "undefined" is no longer supported
+LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('undefined');
+                                            ^
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
 ERROR:  date/time value "current" is no longer supported
 LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
                                             ^
 -- Postgres v6.0 standard output format
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01 1997 PST');
-INSERT INTO TIMESTAMPTZ_TBL VALUES ('Invalid Abstime');
-ERROR:  date/time value "Invalid Abstime" is no longer supported
-LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('Invalid Abstime');
-                                            ^
-INSERT INTO TIMESTAMPTZ_TBL VALUES ('Undefined Abstime');
-ERROR:  date/time value "Undefined Abstime" is no longer supported
-LINE 1: INSERT INTO TIMESTAMPTZ_TBL VALUES ('Undefined Abstime');
-                                            ^
 -- Variations on Postgres v6.1 standard output format
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01.000001 1997 PST');
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01.999999 1997 PST');
diff --git a/src/test/regress/sql/timestamp.sql b/src/test/regress/sql/timestamp.sql
index 8f73e9f45b..790ade3137 100644
--- a/src/test/regress/sql/timestamp.sql
+++ b/src/test/regress/sql/timestamp.sql
@@ -52,12 +52,11 @@ INSERT INTO TIMESTAMP_TBL VALUES ('infinity');
 INSERT INTO TIMESTAMP_TBL VALUES ('epoch');
 -- Obsolete special values
 INSERT INTO TIMESTAMP_TBL VALUES ('invalid');
+INSERT INTO TIMESTAMP_TBL VALUES ('undefined');
 INSERT INTO TIMESTAMP_TBL VALUES ('current');
 
 -- Postgres v6.0 standard output format
 INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01 1997 PST');
-INSERT INTO TIMESTAMP_TBL VALUES ('Invalid Abstime');
-INSERT INTO TIMESTAMP_TBL VALUES ('Undefined Abstime');
 
 -- Variations on Postgres v6.1 standard output format
 INSERT INTO TIMESTAMP_TBL VALUES ('Mon Feb 10 17:32:01.000001 1997 PST');
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index 7da3f8fc92..e74691cc04 100644
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -51,12 +51,11 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES ('infinity');
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('epoch');
 -- Obsolete special values
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('invalid');
+INSERT INTO TIMESTAMPTZ_TBL VALUES ('undefined');
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
 
 -- Postgres v6.0 standard output format
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01 1997 PST');
-INSERT INTO TIMESTAMPTZ_TBL VALUES ('Invalid Abstime');
-INSERT INTO TIMESTAMPTZ_TBL VALUES ('Undefined Abstime');
 
 -- Variations on Postgres v6.1 standard output format
 INSERT INTO TIMESTAMPTZ_TBL VALUES ('Mon Feb 10 17:32:01.000001 1997 PST');