Fix the timestamptz test problem, by moving the tests that use the

timestamp_tbl table into the timestamp test.  Also, restore a test that
used to exist as a valid test in the timestamptz test.

diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out
index 9f585b68f6b2df97009c1b4b28f5f30c3b541936..e4c95120d37f4ff746566f4565b48be24ab52fe5 100644 (file)
--- a/src/test/regress/expected/timestamp.out
+++ b/src/test/regress/expected/timestamp.out
@@ -1675,4 +1675,209 @@ SELECT '' AS to_timestamp_21, to_timestamp('2005364', 'IYYYIDDD');
                  | Sun Jan 01 00:00:00 2006 PST
 (1 row)
 
+SELECT '' AS "54", d1 as "timestamp",
+   date_part( 'isoyear', d1) AS isoyear, date_part( 'week', d1) AS week,
+   date_part( 'dow', d1) AS dow
+   FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
+ 54 |          timestamp          | isoyear | week | dow 
+----+-----------------------------+---------+------+-----
+    | Thu Jan 01 00:00:00 1970    |    1970 |    1 |   4
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:02 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01.40 1997 |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01.50 1997 |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01.60 1997 |    1997 |    7 |   1
+    | Thu Jan 02 00:00:00 1997    |    1997 |    1 |   4
+    | Thu Jan 02 03:04:05 1997    |    1997 |    1 |   4
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Tue Jun 10 17:32:01 1997    |    1997 |   24 |   2
+    | Sat Sep 22 18:19:20 2001    |    2001 |   38 |   6
+    | Wed Mar 15 08:14:01 2000    |    2000 |   11 |   3
+    | Wed Mar 15 13:14:02 2000    |    2000 |   11 |   3
+    | Wed Mar 15 12:14:03 2000    |    2000 |   11 |   3
+    | Wed Mar 15 03:14:04 2000    |    2000 |   11 |   3
+    | Wed Mar 15 02:14:05 2000    |    2000 |   11 |   3
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:00 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Tue Jun 10 18:32:01 1997    |    1997 |   24 |   2
+    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
+    | Tue Feb 11 17:32:01 1997    |    1997 |    7 |   2
+    | Wed Feb 12 17:32:01 1997    |    1997 |    7 |   3
+    | Thu Feb 13 17:32:01 1997    |    1997 |    7 |   4
+    | Fri Feb 14 17:32:01 1997    |    1997 |    7 |   5
+    | Sat Feb 15 17:32:01 1997    |    1997 |    7 |   6
+    | Sun Feb 16 17:32:01 1997    |    1997 |    7 |   0
+    | Sun Feb 16 17:32:01 1997    |    1997 |    7 |   0
+    | Wed Feb 28 17:32:01 1996    |    1996 |    9 |   3
+    | Thu Feb 29 17:32:01 1996    |    1996 |    9 |   4
+    | Fri Mar 01 17:32:01 1996    |    1996 |    9 |   5
+    | Mon Dec 30 17:32:01 1996    |    1997 |    1 |   1
+    | Tue Dec 31 17:32:01 1996    |    1997 |    1 |   2
+    | Wed Jan 01 17:32:01 1997    |    1997 |    1 |   3
+    | Fri Feb 28 17:32:01 1997    |    1997 |    9 |   5
+    | Sat Mar 01 17:32:01 1997    |    1997 |    9 |   6
+    | Tue Dec 30 17:32:01 1997    |    1998 |    1 |   2
+    | Wed Dec 31 17:32:01 1997    |    1998 |    1 |   3
+    | Fri Dec 31 17:32:01 1999    |    1999 |   52 |   5
+    | Sat Jan 01 17:32:01 2000    |    1999 |   52 |   6
+    | Sun Dec 31 17:32:01 2000    |    2000 |   52 |   0
+    | Mon Jan 01 17:32:01 2001    |    2001 |    1 |   1
+(55 rows)
+
+SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
+   FROM TIMESTAMP_TBL;
+ to_char_10 |        to_char         
+------------+------------------------
+            | 
+            | 
+            | 1970 970 70 0 01 004 4
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 01 004 4
+            | 1997 997 97 7 01 004 4
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 24 163 2
+            | 2001 001 01 1 38 265 6
+            | 2000 000 00 0 11 073 3
+            | 2000 000 00 0 11 073 3
+            | 2000 000 00 0 11 073 3
+            | 2000 000 00 0 11 073 3
+            | 2000 000 00 0 11 073 3
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 24 163 2
+            | 1997 997 97 7 07 043 1
+            | 1997 997 97 7 07 044 2
+            | 1997 997 97 7 07 045 3
+            | 1997 997 97 7 07 046 4
+            | 1997 997 97 7 07 047 5
+            | 1997 997 97 7 07 048 6
+            | 1997 997 97 7 07 049 7
+            | 0097 097 97 7 07 044 2
+            | 0097 097 97 7 07 048 6
+            | 0597 597 97 7 07 046 4
+            | 1097 097 97 7 07 044 2
+            | 1697 697 97 7 07 048 6
+            | 1797 797 97 7 07 046 4
+            | 1897 897 97 7 07 044 2
+            | 1997 997 97 7 07 049 7
+            | 2097 097 97 7 07 048 6
+            | 1996 996 96 6 09 059 3
+            | 1996 996 96 6 09 060 4
+            | 1996 996 96 6 09 061 5
+            | 1997 997 97 7 01 001 1
+            | 1997 997 97 7 01 002 2
+            | 1997 997 97 7 01 003 3
+            | 1997 997 97 7 09 061 5
+            | 1997 997 97 7 09 062 6
+            | 1998 998 98 8 01 002 2
+            | 1998 998 98 8 01 003 3
+            | 1999 999 99 9 52 362 5
+            | 1999 999 99 9 52 363 6
+            | 2000 000 00 0 52 364 7
+            | 2001 001 01 1 01 001 1
+(65 rows)
+
+SELECT '' AS to_char_11, to_char(d1, 'FMIYYY FMIYY FMIY FMI FMIW FMIDDD FMID')
+   FROM TIMESTAMP_TBL;
+ to_char_11 |        to_char         
+------------+------------------------
+            | 
+            | 
+            | 1970 970 70 0 1 4 4
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 1 4 4
+            | 1997 997 97 7 1 4 4
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 24 163 2
+            | 2001 001 01 1 38 265 6
+            | 2000 000 00 0 11 73 3
+            | 2000 000 00 0 11 73 3
+            | 2000 000 00 0 11 73 3
+            | 2000 000 00 0 11 73 3
+            | 2000 000 00 0 11 73 3
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 24 163 2
+            | 1997 997 97 7 7 43 1
+            | 1997 997 97 7 7 44 2
+            | 1997 997 97 7 7 45 3
+            | 1997 997 97 7 7 46 4
+            | 1997 997 97 7 7 47 5
+            | 1997 997 97 7 7 48 6
+            | 1997 997 97 7 7 49 7
+            | 97 097 97 7 7 44 2
+            | 97 097 97 7 7 48 6
+            | 597 597 97 7 7 46 4
+            | 1097 097 97 7 7 44 2
+            | 1697 697 97 7 7 48 6
+            | 1797 797 97 7 7 46 4
+            | 1897 897 97 7 7 44 2
+            | 1997 997 97 7 7 49 7
+            | 2097 097 97 7 7 48 6
+            | 1996 996 96 6 9 59 3
+            | 1996 996 96 6 9 60 4
+            | 1996 996 96 6 9 61 5
+            | 1997 997 97 7 1 1 1
+            | 1997 997 97 7 1 2 2
+            | 1997 997 97 7 1 3 3
+            | 1997 997 97 7 9 61 5
+            | 1997 997 97 7 9 62 6
+            | 1998 998 98 8 1 2 2
+            | 1998 998 98 8 1 3 3
+            | 1999 999 99 9 52 362 5
+            | 1999 999 99 9 52 363 6
+            | 2000 000 00 0 52 364 7
+            | 2001 001 01 1 1 1 1
+(65 rows)
+
 SET DateStyle TO DEFAULT;

diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index e875c90d5d1803fb4f1a574dff3998c7bb9fb7a7..c9f6e6b0b1dc6c2b7d37e3da236bd4629e8d4c98 100644 (file)
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -720,69 +720,6 @@ SELECT '' AS "54", d1 as timestamptz,
     | Mon Jan 01 17:32:01 2001 PST    |       1 |  1000 |  1000000
 (56 rows)
 
-SELECT '' AS "54", d1 as "timestamp",
-   date_part( 'isoyear', d1) AS isoyear, date_part( 'week', d1) AS week,
-   date_part( 'dow', d1) AS dow
-   FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
- 54 |          timestamp          | isoyear | week | dow 
-----+-----------------------------+---------+------+-----
-    | Thu Jan 01 00:00:00 1970    |    1970 |    1 |   4
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:02 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01.40 1997 |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01.50 1997 |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01.60 1997 |    1997 |    7 |   1
-    | Thu Jan 02 00:00:00 1997    |    1997 |    1 |   4
-    | Thu Jan 02 03:04:05 1997    |    1997 |    1 |   4
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Tue Jun 10 17:32:01 1997    |    1997 |   24 |   2
-    | Sat Sep 22 18:19:20 2001    |    2001 |   38 |   6
-    | Wed Mar 15 08:14:01 2000    |    2000 |   11 |   3
-    | Wed Mar 15 13:14:02 2000    |    2000 |   11 |   3
-    | Wed Mar 15 12:14:03 2000    |    2000 |   11 |   3
-    | Wed Mar 15 03:14:04 2000    |    2000 |   11 |   3
-    | Wed Mar 15 02:14:05 2000    |    2000 |   11 |   3
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:00 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Tue Jun 10 18:32:01 1997    |    1997 |   24 |   2
-    | Mon Feb 10 17:32:01 1997    |    1997 |    7 |   1
-    | Tue Feb 11 17:32:01 1997    |    1997 |    7 |   2
-    | Wed Feb 12 17:32:01 1997    |    1997 |    7 |   3
-    | Thu Feb 13 17:32:01 1997    |    1997 |    7 |   4
-    | Fri Feb 14 17:32:01 1997    |    1997 |    7 |   5
-    | Sat Feb 15 17:32:01 1997    |    1997 |    7 |   6
-    | Sun Feb 16 17:32:01 1997    |    1997 |    7 |   0
-    | Sun Feb 16 17:32:01 1997    |    1997 |    7 |   0
-    | Wed Feb 28 17:32:01 1996    |    1996 |    9 |   3
-    | Thu Feb 29 17:32:01 1996    |    1996 |    9 |   4
-    | Fri Mar 01 17:32:01 1996    |    1996 |    9 |   5
-    | Mon Dec 30 17:32:01 1996    |    1997 |    1 |   1
-    | Tue Dec 31 17:32:01 1996    |    1997 |    1 |   2
-    | Wed Jan 01 17:32:01 1997    |    1997 |    1 |   3
-    | Fri Feb 28 17:32:01 1997    |    1997 |    9 |   5
-    | Sat Mar 01 17:32:01 1997    |    1997 |    9 |   6
-    | Tue Dec 30 17:32:01 1997    |    1998 |    1 |   2
-    | Wed Dec 31 17:32:01 1997    |    1998 |    1 |   3
-    | Fri Dec 31 17:32:01 1999    |    1999 |   52 |   5
-    | Sat Jan 01 17:32:01 2000    |    1999 |   52 |   6
-    | Sun Dec 31 17:32:01 2000    |    2000 |   52 |   0
-    | Mon Jan 01 17:32:01 2001    |    2001 |    1 |   1
-(55 rows)
-
 -- TO_CHAR()
 SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') 
    FROM TIMESTAMPTZ_TBL;
@@ -1437,147 +1374,77 @@ SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. H
            | 2001 A.D. 2001 a.d. 2001 ad 05:32:01 P.M. 05:32:01 p.m. 05:32:01 pm
 (66 rows)
 
-SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
-   FROM TIMESTAMP_TBL;
- to_char_10 |        to_char         
-------------+------------------------
-            | 
-            | 
-            | 1970 970 70 0 01 004 4
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 01 004 4
-            | 1997 997 97 7 01 004 4
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 24 163 2
-            | 2001 001 01 1 38 265 6
-            | 2000 000 00 0 11 073 3
-            | 2000 000 00 0 11 073 3
-            | 2000 000 00 0 11 073 3
-            | 2000 000 00 0 11 073 3
-            | 2000 000 00 0 11 073 3
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 24 163 2
-            | 1997 997 97 7 07 043 1
-            | 1997 997 97 7 07 044 2
-            | 1997 997 97 7 07 045 3
-            | 1997 997 97 7 07 046 4
-            | 1997 997 97 7 07 047 5
-            | 1997 997 97 7 07 048 6
-            | 1997 997 97 7 07 049 7
-            | 0097 097 97 7 07 044 2
-            | 0097 097 97 7 07 048 6
-            | 0597 597 97 7 07 046 4
-            | 1097 097 97 7 07 044 2
-            | 1697 697 97 7 07 048 6
-            | 1797 797 97 7 07 046 4
-            | 1897 897 97 7 07 044 2
-            | 1997 997 97 7 07 049 7
-            | 2097 097 97 7 07 048 6
-            | 1996 996 96 6 09 059 3
-            | 1996 996 96 6 09 060 4
-            | 1996 996 96 6 09 061 5
-            | 1997 997 97 7 01 001 1
-            | 1997 997 97 7 01 002 2
-            | 1997 997 97 7 01 003 3
-            | 1997 997 97 7 09 061 5
-            | 1997 997 97 7 09 062 6
-            | 1998 998 98 8 01 002 2
-            | 1998 998 98 8 01 003 3
-            | 1999 999 99 9 52 362 5
-            | 1999 999 99 9 52 363 6
-            | 2000 000 00 0 52 364 7
-            | 2001 001 01 1 01 001 1
-(65 rows)
-
-SELECT '' AS to_char_11, to_char(d1, 'FMIYYY FMIYY FMIY FMI FMIW FMIDDD FMID')
-   FROM TIMESTAMP_TBL;
- to_char_11 |        to_char         
-------------+------------------------
+SELECT '' AS to_char_10, to_char(d1, 'YYYY WW IYYY IYY IY I IW')
+   FROM TIMESTAMPTZ_TBL;
+ to_char_10 |         to_char          
+------------+--------------------------
             | 
             | 
-            | 1970 970 70 0 1 4 4
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 1 4 4
-            | 1997 997 97 7 1 4 4
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 24 163 2
-            | 2001 001 01 1 38 265 6
-            | 2000 000 00 0 11 73 3
-            | 2000 000 00 0 11 73 3
-            | 2000 000 00 0 11 73 3
-            | 2000 000 00 0 11 73 3
-            | 2000 000 00 0 11 73 3
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 24 163 2
-            | 1997 997 97 7 7 43 1
-            | 1997 997 97 7 7 44 2
-            | 1997 997 97 7 7 45 3
-            | 1997 997 97 7 7 46 4
-            | 1997 997 97 7 7 47 5
-            | 1997 997 97 7 7 48 6
-            | 1997 997 97 7 7 49 7
-            | 97 097 97 7 7 44 2
-            | 97 097 97 7 7 48 6
-            | 597 597 97 7 7 46 4
-            | 1097 097 97 7 7 44 2
-            | 1697 697 97 7 7 48 6
-            | 1797 797 97 7 7 46 4
-            | 1897 897 97 7 7 44 2
-            | 1997 997 97 7 7 49 7
-            | 2097 097 97 7 7 48 6
-            | 1996 996 96 6 9 59 3
-            | 1996 996 96 6 9 60 4
-            | 1996 996 96 6 9 61 5
-            | 1997 997 97 7 1 1 1
-            | 1997 997 97 7 1 2 2
-            | 1997 997 97 7 1 3 3
-            | 1997 997 97 7 9 61 5
-            | 1997 997 97 7 9 62 6
-            | 1998 998 98 8 1 2 2
-            | 1998 998 98 8 1 3 3
-            | 1999 999 99 9 52 362 5
-            | 1999 999 99 9 52 363 6
-            | 2000 000 00 0 52 364 7
-            | 2001 001 01 1 1 1 1
-(65 rows)
+            | 1969 53 1970 970 70 0 01
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 01 1997 997 97 7 01
+            | 1997 01 1997 997 97 7 01
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 23 1997 997 97 7 24
+            | 2001 38 2001 001 01 1 38
+            | 2000 11 2000 000 00 0 11
+            | 2000 11 2000 000 00 0 11
+            | 2000 11 2000 000 00 0 11
+            | 2000 11 2000 000 00 0 11
+            | 2000 11 2000 000 00 0 11
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 28 1997 997 97 7 28
+            | 1997 23 1997 997 97 7 24
+            | 1997 06 1997 997 97 7 07
+            | 1997 06 1997 997 97 7 07
+            | 1997 07 1997 997 97 7 07
+            | 1997 07 1997 997 97 7 07
+            | 1997 07 1997 997 97 7 07
+            | 1997 07 1997 997 97 7 07
+            | 1997 07 1997 997 97 7 07
+            | 0097 07 0097 097 97 7 07
+            | 0097 07 0097 097 97 7 07
+            | 0597 07 0597 597 97 7 07
+            | 1097 07 1097 097 97 7 07
+            | 1697 07 1697 697 97 7 07
+            | 1797 07 1797 797 97 7 07
+            | 1897 07 1897 897 97 7 07
+            | 1997 07 1997 997 97 7 07
+            | 2097 07 2097 097 97 7 07
+            | 1996 09 1996 996 96 6 09
+            | 1996 09 1996 996 96 6 09
+            | 1996 09 1996 996 96 6 09
+            | 1996 53 1997 997 97 7 01
+            | 1996 53 1997 997 97 7 01
+            | 1997 01 1997 997 97 7 01
+            | 1997 09 1997 997 97 7 09
+            | 1997 09 1997 997 97 7 09
+            | 1997 52 1998 998 98 8 01
+            | 1997 53 1998 998 98 8 01
+            | 1999 53 1999 999 99 9 52
+            | 2000 01 1999 999 99 9 52
+            | 2000 53 2000 000 00 0 52
+            | 2001 01 2001 001 01 1 01
+(66 rows)
 
 -- TO_TIMESTAMP()
 SELECT '' AS to_timestamp_1, to_timestamp('0097/Feb/16 --> 08:14:30', 'YYYY/Mon/DD --> HH:MI:SS');

diff --git a/src/test/regress/sql/timestamp.sql b/src/test/regress/sql/timestamp.sql
index 81be5b8f33f11664bf993081bc3b2fa047f98dad..41234f9f936fbd3058d7cfc990e50cb7244a8585 100644 (file)
--- a/src/test/regress/sql/timestamp.sql
+++ b/src/test/regress/sql/timestamp.sql
@@ -255,4 +255,15 @@ SELECT '' AS to_timestamp_20, to_timestamp('5527', 'IIWID');
 
 SELECT '' AS to_timestamp_21, to_timestamp('2005364', 'IYYYIDDD');
 
+SELECT '' AS "54", d1 as "timestamp",
+   date_part( 'isoyear', d1) AS isoyear, date_part( 'week', d1) AS week,
+   date_part( 'dow', d1) AS dow
+   FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
+
+SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
+   FROM TIMESTAMP_TBL;
+
+SELECT '' AS to_char_11, to_char(d1, 'FMIYYY FMIYY FMIY FMI FMIW FMIDDD FMID')
+   FROM TIMESTAMP_TBL;
+
 SET DateStyle TO DEFAULT;

diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index 6ef216a53a28224635f1b6fb9e8d3f4eeb3676e2..db15c578fd0fe6e0ecaf79c2dcbc0436622232f6 100644 (file)
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -169,11 +169,6 @@ SELECT '' AS "54", d1 as timestamptz,
    date_part( 'usec', d1) AS usec
    FROM TIMESTAMPTZ_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
 
-SELECT '' AS "54", d1 as "timestamp",
-   date_part( 'isoyear', d1) AS isoyear, date_part( 'week', d1) AS week,
-   date_part( 'dow', d1) AS dow
-   FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01';
-
 -- TO_CHAR()
 SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') 
    FROM TIMESTAMPTZ_TBL;
@@ -202,11 +197,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
 SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') 
    FROM TIMESTAMPTZ_TBL;   
 
-SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
-   FROM TIMESTAMP_TBL;
-
-SELECT '' AS to_char_11, to_char(d1, 'FMIYYY FMIYY FMIY FMI FMIW FMIDDD FMID')
-   FROM TIMESTAMP_TBL;
+SELECT '' AS to_char_10, to_char(d1, 'YYYY WW IYYY IYY IY I IW')
+   FROM TIMESTAMPTZ_TBL;
 
 -- TO_TIMESTAMP()
 SELECT '' AS to_timestamp_1, to_timestamp('0097/Feb/16 --> 08:14:30', 'YYYY/Mon/DD --> HH:MI:SS');