resolve failures in timestamp/timestamptz regression tests

Update the SQL and expected output for XL, and remove unnecessary
whitespace (mostly at the end of line) to make diffing easier.

4 files changed, 48 insertions, 68 deletions

diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out
index 0801c30843..2aa1a55257 100644
--- a/src/test/regress/expected/timestamp.out
+++ b/src/test/regress/expected/timestamp.out
@@ -816,7 +816,7 @@ SELECT '' AS "54", d1 as "timestamp",
 (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') 
+SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon')
    FROM TIMESTAMP_TBL ORDER BY d1;
  to_char_1 |                                         to_char                                          
 -----------+------------------------------------------------------------------------------------------
@@ -960,10 +960,10 @@ SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth F
 
 SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
    FROM TIMESTAMP_TBL ORDER BY d1;
- to_char_3 |                     to_char                     
------------+-------------------------------------------------
+ to_char_3 |                     to_char                      
+-----------+--------------------------------------------------
            | 
-           | 0,097 0097 097 97 7 -1 1 02 07 047 16 3 1686042
+           | 0,097 0097 097 97 7 -01 1 02 07 047 16 3 1686042
            | 0,097 0097 097 97 7 01 1 02 07 047 16 7 1756536
            | 0,597 0597 597 97 7 06 1 02 07 047 16 5 1939157
            | 1,097 1097 097 97 7 11 1 02 07 047 16 3 2121778
@@ -1008,13 +1008,6 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
            | 1,997 1997 997 97 7 20 1 02 07 045 14 6 2450494
            | 1,997 1997 997 97 7 20 1 02 07 046 15 7 2450495
            | 1,997 1997 997 97 7 20 1 02 07 047 16 1 2450496
-           | 0,097 0097 097 97 7 -01 1 02 07 047 16 3 1686042
-           | 0,097 0097 097 97 7 01 1 02 07 047 16 7 1756536
-           | 0,597 0597 597 97 7 06 1 02 07 047 16 5 1939157
-           | 1,097 1097 097 97 7 11 1 02 07 047 16 3 2121778
-           | 1,697 1697 697 97 7 17 1 02 07 047 16 7 2340924
-           | 1,797 1797 797 97 7 18 1 02 07 047 16 5 2377448
-           | 1,897 1897 897 97 7 19 1 02 07 047 16 3 2413972
            | 1,997 1997 997 97 7 20 1 02 07 047 16 1 2450496
            | 1,997 1997 997 97 7 20 1 02 09 059 28 6 2450508
            | 1,997 1997 997 97 7 20 1 03 09 060 01 7 2450509
@@ -1036,7 +1029,7 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
            | 
 (65 rows)
 
-SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') 
+SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ')
    FROM TIMESTAMP_TBL ORDER BY d1;
  to_char_4 |                     to_char                     
 -----------+-------------------------------------------------
@@ -1107,7 +1100,7 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM
            | 
 (65 rows)
 
-SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') 
+SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
    FROM TIMESTAMP_TBL ORDER BY d1;
  to_char_5 |       to_char        
 -----------+----------------------
@@ -1178,7 +1171,7 @@ SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
            | 
 (65 rows)
 
-SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') 
+SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""')
    FROM TIMESTAMP_TBL ORDER BY d1;
  to_char_6 |                     to_char                     
 -----------+-------------------------------------------------
@@ -1320,7 +1313,7 @@ SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS')
            | 
 (65 rows)
 
-SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') 
+SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
    FROM TIMESTAMP_TBL ORDER BY d1;
  to_char_8 |         to_char         
 -----------+-------------------------
@@ -1391,9 +1384,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
            | 
 (65 rows)
 
-  
-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 TIMESTAMP_TBL ORDER BY d1;   
+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 TIMESTAMP_TBL ORDER BY d1;
  to_char_9 |                               to_char                               
 -----------+---------------------------------------------------------------------
            | 
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 7163e37d8d..a8b7438068 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -907,7 +907,7 @@ SELECT '' AS "54", d1 as timestamptz,
 (56 rows)
 
 -- TO_CHAR()
-SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') 
+SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_1 |                                         to_char                                          
 -----------+------------------------------------------------------------------------------------------
@@ -979,9 +979,8 @@ SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM M
            | 
 (66 rows)
 
-	
 SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM')
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;	
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_2 |                           to_char                            
 -----------+--------------------------------------------------------------
            | 
@@ -1054,10 +1053,10 @@ SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth F
 
 SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
- to_char_3 |                     to_char                     
------------+-------------------------------------------------
+ to_char_3 |                     to_char                      
+-----------+--------------------------------------------------
            | 
-           | 0,097 0097 097 97 7 -1 1 02 07 047 16 3 1686042
+           | 0,097 0097 097 97 7 -01 1 02 07 047 16 3 1686042
            | 0,097 0097 097 97 7 01 1 02 07 047 16 7 1756536
            | 0,597 0597 597 97 7 06 1 02 07 047 16 5 1939157
            | 1,097 1097 097 97 7 11 1 02 07 047 16 3 2121778
@@ -1102,13 +1101,6 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
            | 1,997 1997 997 97 7 20 1 02 07 045 14 6 2450494
            | 1,997 1997 997 97 7 20 1 02 07 046 15 7 2450495
            | 1,997 1997 997 97 7 20 1 02 07 047 16 1 2450496
-           | 0,097 0097 097 97 7 -01 1 02 07 047 16 3 1686042
-           | 0,097 0097 097 97 7 01 1 02 07 047 16 7 1756536
-           | 0,597 0597 597 97 7 06 1 02 07 047 16 5 1939157
-           | 1,097 1097 097 97 7 11 1 02 07 047 16 3 2121778
-           | 1,697 1697 697 97 7 17 1 02 07 047 16 7 2340924
-           | 1,797 1797 797 97 7 18 1 02 07 047 16 5 2377448
-           | 1,897 1897 897 97 7 19 1 02 07 047 16 3 2413972
            | 1,997 1997 997 97 7 20 1 02 07 047 16 1 2450496
            | 1,997 1997 997 97 7 20 1 02 09 059 28 6 2450508
            | 1,997 1997 997 97 7 20 1 03 09 060 01 7 2450509
@@ -1131,9 +1123,8 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
            | 
 (66 rows)
 
-	
-SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') 
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;	
+SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ')
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_4 |                     to_char                     
 -----------+-------------------------------------------------
            | 
@@ -1204,8 +1195,7 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM
            | 
 (66 rows)
 
-	
-SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') 
+SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_5 |       to_char        
 -----------+----------------------
@@ -1277,8 +1267,8 @@ SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
            | 
 (66 rows)
 
-SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') 
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;		
+SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""')
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_6 |                     to_char                     
 -----------+-------------------------------------------------
            | 
@@ -1349,9 +1339,8 @@ SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between qu
            | 
 (66 rows)
 
-		
 SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS')
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;		
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_7 |        to_char         
 -----------+------------------------
            | 
@@ -1422,7 +1411,7 @@ SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS')
            | 
 (66 rows)
 
-SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') 
+SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
  to_char_8 |         to_char         
 -----------+-------------------------
@@ -1494,9 +1483,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
            | 
 (66 rows)
 
-  
-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 ORDER BY d1;   
+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 ORDER BY d1;
  to_char_9 |                               to_char                               
 -----------+---------------------------------------------------------------------
            | 
diff --git a/src/test/regress/sql/timestamp.sql b/src/test/regress/sql/timestamp.sql
index 41c858eee6..690703bc09 100644
--- a/src/test/regress/sql/timestamp.sql
+++ b/src/test/regress/sql/timestamp.sql
@@ -195,7 +195,7 @@ SELECT '' AS "54", d1 as "timestamp",
    FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01' ORDER BY d1;
 
 -- TO_CHAR()
-SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') 
+SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon')
    FROM TIMESTAMP_TBL ORDER BY d1;
 
 SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM')
@@ -204,23 +204,23 @@ SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth F
 SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
    FROM TIMESTAMP_TBL ORDER BY d1;
 
-SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') 
+SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ')
    FROM TIMESTAMP_TBL ORDER BY d1;
 
-SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') 
+SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
    FROM TIMESTAMP_TBL ORDER BY d1;
 
-SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') 
+SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""')
    FROM TIMESTAMP_TBL ORDER BY d1;
 
 SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS')
    FROM TIMESTAMP_TBL ORDER BY d1;
 
-SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') 
+SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
+   FROM TIMESTAMP_TBL ORDER BY d1;
+
+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 TIMESTAMP_TBL ORDER BY d1;
-  
-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 TIMESTAMP_TBL ORDER BY d1;   
 
 SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
    FROM TIMESTAMP_TBL ORDER BY d1;
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index 8c16917127..332c72cb62 100644
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -215,32 +215,32 @@ SELECT '' AS "54", d1 as timestamptz,
    FROM TIMESTAMPTZ_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01' ORDER BY d1;
 
 -- TO_CHAR()
-SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') 
+SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
-	
+
 SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM')
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;	
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
 
 SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
-	
-SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') 
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;	
-	
-SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') 
+
+SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ')
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
+
+SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS')
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
+
+SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;
 
-SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') 
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;		
-		
 SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS')
-   FROM TIMESTAMPTZ_TBL ORDER BY d1;		
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
+
+SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth')
+   FROM TIMESTAMPTZ_TBL ORDER BY d1;
 
-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 ORDER BY d1;
-  
-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 ORDER BY d1;   
 
 SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
    FROM TIMESTAMPTZ_TBL ORDER BY d1;