diff --git a/src/test/regress/expected/abstime-solaris-1947.out b/src/test/regress/expected/abstime-solaris-1947.out
index ae1780b6eceabf7b1c3c6b7cd611233fb107fd04..37ce695c4340a04c3087a986fe21ca3818832380 100644
--- a/src/test/regress/expected/abstime-solaris-1947.out
+++ b/src/test/regress/expected/abstime-solaris-1947.out
@@ -10,7 +10,7 @@
--
CREATE TABLE ABSTIME_TBL (f1 abstime);
BEGIN;
-INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'current');
+INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'now');
INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'now');
SELECT count(*) AS two FROM ABSTIME_TBL WHERE f1 = 'now' ;
two
diff --git a/src/test/regress/expected/abstime.out b/src/test/regress/expected/abstime.out
index 74da4c5b91247fea6f6b2fe798c652d0615bce08..bc810a6d2b22d4bb72a03d3585e90774c01e3257 100644
--- a/src/test/regress/expected/abstime.out
+++ b/src/test/regress/expected/abstime.out
@@ -10,7 +10,7 @@
--
CREATE TABLE ABSTIME_TBL (f1 abstime);
BEGIN;
-INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'current');
+INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'now');
INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'now');
SELECT count(*) AS two FROM ABSTIME_TBL WHERE f1 = 'now' ;
two
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 04dc44422f944383123de9565a82741fe039f680..135ee9d39e9153b508d8e3b3a39f094fcbf3e4a5 100644
--- a/src/test/regress/expected/horology-no-DST-before-1970.out
+++ b/src/test/regress/expected/horology-no-DST-before-1970.out
@@ -2000,7 +2000,7 @@ SELECT '' AS three, ABSTIME_TBL.*
--
SELECT '' AS "16", f1 AS "timestamp", date(f1) AS date
FROM TEMP_TIMESTAMP
- WHERE f1 <> timestamp 'current'
+ WHERE f1 <> timestamp 'now'
ORDER BY date, "timestamp";
16 | timestamp | date
----+------------------------------+------------
@@ -2047,7 +2047,7 @@ SELECT '' AS "16", f1 AS "timestamp", abstime(f1) AS abstime
SELECT '' AS four, f1 AS abstime, date(f1) AS date
FROM ABSTIME_TBL
- WHERE isfinite(f1) AND f1 <> abstime 'current'
+ WHERE isfinite(f1) AND f1 <> abstime 'now'
ORDER BY date, abstime;
four | abstime | date
------+------------------------------+------------
diff --git a/src/test/regress/expected/horology-solaris-1947.out b/src/test/regress/expected/horology-solaris-1947.out
index cba5723a2e8fb5d81675dc88b22800520acbbb14..533a197d3bcba1f021fe10735bc030a2ec4780a7 100644
--- a/src/test/regress/expected/horology-solaris-1947.out
+++ b/src/test/regress/expected/horology-solaris-1947.out
@@ -2000,7 +2000,7 @@ SELECT '' AS three, ABSTIME_TBL.*
--
SELECT '' AS "16", f1 AS "timestamp", date(f1) AS date
FROM TEMP_TIMESTAMP
- WHERE f1 <> timestamp 'current'
+ WHERE f1 <> timestamp 'now'
ORDER BY date, "timestamp";
16 | timestamp | date
----+------------------------------+------------
@@ -2047,7 +2047,7 @@ SELECT '' AS "16", f1 AS "timestamp", abstime(f1) AS abstime
SELECT '' AS four, f1 AS abstime, date(f1) AS date
FROM ABSTIME_TBL
- WHERE isfinite(f1) AND f1 <> abstime 'current'
+ WHERE isfinite(f1) AND f1 <> abstime 'now'
ORDER BY date, abstime;
four | abstime | date
------+------------------------------+------------
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index 487786f37a56d123c3300edf08df5766374f791a..030200340f4a91b7e9c497b29cbdbfe5a30bd176 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -2000,7 +2000,7 @@ SELECT '' AS three, ABSTIME_TBL.*
--
SELECT '' AS "16", f1 AS "timestamp", date(f1) AS date
FROM TEMP_TIMESTAMP
- WHERE f1 <> timestamp 'current'
+ WHERE f1 <> timestamp 'now'
ORDER BY date, "timestamp";
16 | timestamp | date
----+------------------------------+------------
@@ -2047,7 +2047,7 @@ SELECT '' AS "16", f1 AS "timestamp", abstime(f1) AS abstime
SELECT '' AS four, f1 AS abstime, date(f1) AS date
FROM ABSTIME_TBL
- WHERE isfinite(f1) AND f1 <> abstime 'current'
+ WHERE isfinite(f1) AND f1 <> abstime 'now'
ORDER BY date, abstime;
four | abstime | date
------+------------------------------+------------
diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out
index 70fa14c31a63de9455ba454bd15499da6565b821..0432cc99d9497899aa28bb9a4a77cf9dc5252cc6 100644
--- a/src/test/regress/expected/timestamp.out
+++ b/src/test/regress/expected/timestamp.out
@@ -11,6 +11,7 @@ CREATE TABLE TIMESTAMP_TBL ( d1 timestamp(2) without time zone);
-- statements.
INSERT INTO TIMESTAMP_TBL VALUES ('now');
INSERT INTO TIMESTAMP_TBL VALUES ('current');
+ERROR: Bad timestamp external representation 'current'
INSERT INTO TIMESTAMP_TBL VALUES ('today');
INSERT INTO TIMESTAMP_TBL VALUES ('yesterday');
INSERT INTO TIMESTAMP_TBL VALUES ('tomorrow');
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 70325aac85c1dd2116c116feed75bf0b128f362f..4d0caff9a72507355d09068427c5da0d2e107f6a 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -6,6 +6,7 @@ SET australian_timezones = 'off';
CREATE TABLE TIMESTAMPTZ_TBL ( d1 timestamp(2) with time zone);
INSERT INTO TIMESTAMPTZ_TBL VALUES ('now');
INSERT INTO TIMESTAMPTZ_TBL VALUES ('current');
+ERROR: Bad timestamp external representation 'current'
INSERT INTO TIMESTAMPTZ_TBL VALUES ('today');
INSERT INTO TIMESTAMPTZ_TBL VALUES ('yesterday');
INSERT INTO TIMESTAMPTZ_TBL VALUES ('tomorrow');
diff --git a/src/test/regress/sql/abstime.sql b/src/test/regress/sql/abstime.sql
index 16b24ffb1079b86b5c8974ad613b713129aaffb2..28a0f284838be2cb7865e8744759552eaf2f2bc4 100644
--- a/src/test/regress/sql/abstime.sql
+++ b/src/test/regress/sql/abstime.sql
@@ -13,7 +13,7 @@
CREATE TABLE ABSTIME_TBL (f1 abstime);
BEGIN;
-INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'current');
+INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'now');
INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'now');
SELECT count(*) AS two FROM ABSTIME_TBL WHERE f1 = 'now' ;
END;
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index d302d1560d8161f1a0418c2e234a82d449279c26..75efd627ba20874948141451a830b022ff8fde57 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -229,7 +229,7 @@ SELECT '' AS three, ABSTIME_TBL.*
SELECT '' AS "16", f1 AS "timestamp", date(f1) AS date
FROM TEMP_TIMESTAMP
- WHERE f1 <> timestamp 'current'
+ WHERE f1 <> timestamp 'now'
ORDER BY date, "timestamp";
SELECT '' AS "16", f1 AS "timestamp", abstime(f1) AS abstime
@@ -238,7 +238,7 @@ SELECT '' AS "16", f1 AS "timestamp", abstime(f1) AS abstime
SELECT '' AS four, f1 AS abstime, date(f1) AS date
FROM ABSTIME_TBL
- WHERE isfinite(f1) AND f1 <> abstime 'current'
+ WHERE isfinite(f1) AND f1 <> abstime 'now'
ORDER BY date, abstime;
SELECT '' AS two, d1 AS "timestamp", abstime(d1) AS abstime