Merger upstream/master

Author: wangyum

sql/core/src/test/resources/sql-tests/inputs/pgSQL/date.sql

@@ -201,14 +201,14 @@ SELECT date '5874898-01-01';  -- out of range
 
 -- RESET datestyle;
 
--- [SPARK-27898] Support 4 date operators(date + integer, integer + date, date - integer and date - date)
 --
 -- Simple math
 -- Leave most of it for the horology tests
 --
 
--- SELECT f1 - date '2000-01-01' AS "Days From 2K" FROM DATE_TBL;
+SELECT f1 - date '2000-01-01' AS `Days From 2K` FROM DATE_TBL;
 
+-- [SPARK-28141] Date type can not accept special values
 -- SELECT f1 - date 'epoch' AS "Days From Epoch" FROM DATE_TBL;
 
 -- SELECT date 'yesterday' - date 'today' AS "One day";

sql/core/src/test/resources/sql-tests/results/pgSQL/date.sql.out

@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 47
+-- Number of queries: 48
 
 
 -- !query 0
@@ -414,20 +414,30 @@ SELECT date '5874898-01-01'
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-DROP TABLE DATE_TBL
+SELECT f1 - date '2000-01-01' AS `Days From 2K` FROM DATE_TBL
 -- !query 46 schema
-struct<>
+struct<Days From 2K:int>
 -- !query 46 output
+-1035
+-1036
+-1037
+-1400
+-1401
+-1402
+-1403
+-15542
+-15607
+13977
+14343
+14710
+91
+92
+93
+
+
+-- !query 47
+DROP TABLE DATE_TBL
+-- !query 47 schema
+struct<>
+-- !query 47 output