From 52ca149b362202828b271b9294676fa193cd57c5 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 21 Nov 2001 18:27:25 +0000
Subject: [PATCH] Update regress tests to reflect removal of 'current'.
---
src/test/regress/expected/abstime-solaris-1947.out | 2 +-
src/test/regress/expected/abstime.out | 2 +-
src/test/regress/expected/horology-no-DST-before-1970.out | 4 ++--
src/test/regress/expected/horology-solaris-1947.out | 4 ++--
src/test/regress/expected/horology.out | 4 ++--
src/test/regress/expected/timestamp.out | 1 +
src/test/regress/expected/timestamptz.out | 1 +
src/test/regress/sql/abstime.sql | 2 +-
src/test/regress/sql/horology.sql | 4 ++--
9 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/test/regress/expected/abstime-solaris-1947.out b/src/test/regress/expected/abstime-solaris-1947.out
index ae1780b6ece..37ce695c434 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 74da4c5b912..bc810a6d2b2 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 04dc44422f9..135ee9d39e9 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 cba5723a2e8..533a197d3bc 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 487786f37a5..030200340f4 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 70fa14c31a6..0432cc99d94 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 70325aac85c..4d0caff9a72 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 16b24ffb107..28a0f284838 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 d302d1560d8..75efd627ba2 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
--
GitLab