This is an automated email from the ASF dual-hosted git repository.

gengliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new 3acc4b9  [SPARK-35971][SQL] Rename the type name of TimestampNTZType 
as "timestamp_ntz"
3acc4b9 is described below

commit 3acc4b973b57f88fbe681c7db89cd55699750178
Author: Gengliang Wang <gengli...@apache.org>
AuthorDate: Thu Jul 1 20:50:19 2021 +0800

    [SPARK-35971][SQL] Rename the type name of TimestampNTZType as 
"timestamp_ntz"
    
    ### What changes were proposed in this pull request?
    
    Rename the type name string of TimestampNTZType from "timestamp without 
time zone" to "timestamp_ntz".
    
    ### Why are the changes needed?
    
    This is to make the column header shorter and simpler.
    Snowflake and Flink uses similar approach:
    https://docs.snowflake.com/en/sql-reference/data-types-datetime.html
    
https://ci.apache.org/projects/flink/flink-docs-master/docs/dev/table/concepts/timezone/
    
    ### Does this PR introduce _any_ user-facing change?
    
    No, the new timestamp type is not released yet.
    
    ### How was this patch tested?
    
    Unit tests
    
    Closes #33173 from gengliangwang/reviseTypeName.
    
    Authored-by: Gengliang Wang <gengli...@apache.org>
    Signed-off-by: Gengliang Wang <gengli...@apache.org>
---
 .../apache/spark/sql/types/TimestampNTZType.scala  |   2 +-
 .../sql/catalyst/expressions/CastSuiteBase.scala   |   4 +-
 .../sql-functions/sql-expression-schema.md         |   4 +-
 .../sql-tests/results/ansi/datetime.sql.out        |  92 +++++++++---------
 .../sql-tests/results/datetime-legacy.sql.out      | 108 ++++++++++-----------
 .../resources/sql-tests/results/datetime.sql.out   | 108 ++++++++++-----------
 6 files changed, 159 insertions(+), 159 deletions(-)

diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/TimestampNTZType.scala 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/TimestampNTZType.scala
index 347fd4a..f7d20a0 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/TimestampNTZType.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/TimestampNTZType.scala
@@ -48,7 +48,7 @@ class TimestampNTZType private() extends AtomicType {
    */
   override def defaultSize: Int = 8
 
-  override def typeName: String = "timestamp without time zone"
+  override def typeName: String = "timestamp_ntz"
 
   private[spark] override def asNullable: TimestampNTZType = this
 }
diff --git 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala
 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala
index f6a628a..66f5b50 100644
--- 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala
+++ 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/CastSuiteBase.scala
@@ -939,11 +939,11 @@ abstract class CastSuiteBase extends SparkFunSuite with 
ExpressionEvalHelper {
   test("disallow type conversions between Numeric types and Timestamp without 
time zone type") {
     import DataTypeTestUtils.numericTypes
     checkInvalidCastFromNumericType(TimestampNTZType)
-    var errorMsg = "cannot cast bigint to timestamp without time zone"
+    var errorMsg = "cannot cast bigint to timestamp_ntz"
     verifyCastFailure(cast(Literal(0L), TimestampNTZType), Some(errorMsg))
 
     val timestampNTZLiteral = Literal.create(LocalDateTime.now(), 
TimestampNTZType)
-    errorMsg = "cannot cast timestamp without time zone to"
+    errorMsg = "cannot cast timestamp_ntz to"
     numericTypes.foreach { numericType =>
       verifyCastFailure(cast(timestampNTZLiteral, numericType), Some(errorMsg))
     }
diff --git a/sql/core/src/test/resources/sql-functions/sql-expression-schema.md 
b/sql/core/src/test/resources/sql-functions/sql-expression-schema.md
index 5fa37c4..00fb172 100644
--- a/sql/core/src/test/resources/sql-functions/sql-expression-schema.md
+++ b/sql/core/src/test/resources/sql-functions/sql-expression-schema.md
@@ -206,7 +206,7 @@
 | org.apache.spark.sql.catalyst.expressions.Overlay | overlay | SELECT 
overlay('Spark SQL' PLACING '_' FROM 6) | struct<overlay(Spark SQL, _, 6, 
-1):string> |
 | org.apache.spark.sql.catalyst.expressions.ParseToDate | to_date | SELECT 
to_date('2009-07-30 04:17:52') | struct<to_date(2009-07-30 04:17:52):date> |
 | org.apache.spark.sql.catalyst.expressions.ParseToTimestamp | to_timestamp | 
SELECT to_timestamp('2016-12-31 00:12:00') | struct<to_timestamp(2016-12-31 
00:12:00):timestamp> |
-| org.apache.spark.sql.catalyst.expressions.ParseToTimestampNTZ | 
to_timestamp_ntz | SELECT to_timestamp_ntz('2016-12-31 00:12:00') | 
struct<to_timestamp_ntz(2016-12-31 00:12:00):timestamp without time zone> |
+| org.apache.spark.sql.catalyst.expressions.ParseToTimestampNTZ | 
to_timestamp_ntz | SELECT to_timestamp_ntz('2016-12-31 00:12:00') | 
struct<to_timestamp_ntz(2016-12-31 00:12:00):timestamp_ntz> |
 | org.apache.spark.sql.catalyst.expressions.ParseUrl | parse_url | SELECT 
parse_url('http://spark.apache.org/path?query=1', 'HOST') | 
struct<parse_url(http://spark.apache.org/path?query=1, HOST):string> |
 | org.apache.spark.sql.catalyst.expressions.PercentRank | percent_rank | 
SELECT a, b, percent_rank(b) OVER (PARTITION BY a ORDER BY b) FROM VALUES 
('A1', 2), ('A1', 1), ('A2', 3), ('A1', 1) tab(a, b) | 
struct<a:string,b:int,PERCENT_RANK() OVER (PARTITION BY a ORDER BY b ASC NULLS 
FIRST ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW):double> |
 | org.apache.spark.sql.catalyst.expressions.Pi | pi | SELECT pi() | 
struct<PI():double> |
@@ -361,4 +361,4 @@
 | org.apache.spark.sql.catalyst.expressions.xml.XPathList | xpath | SELECT 
xpath('<a><b>b1</b><b>b2</b><b>b3</b><c>c1</c><c>c2</c></a>','a/b/text()') | 
struct<xpath(<a><b>b1</b><b>b2</b><b>b3</b><c>c1</c><c>c2</c></a>, 
a/b/text()):array<string>> |
 | org.apache.spark.sql.catalyst.expressions.xml.XPathLong | xpath_long | 
SELECT xpath_long('<a><b>1</b><b>2</b></a>', 'sum(a/b)') | 
struct<xpath_long(<a><b>1</b><b>2</b></a>, sum(a/b)):bigint> |
 | org.apache.spark.sql.catalyst.expressions.xml.XPathShort | xpath_short | 
SELECT xpath_short('<a><b>1</b><b>2</b></a>', 'sum(a/b)') | 
struct<xpath_short(<a><b>1</b><b>2</b></a>, sum(a/b)):smallint> |
-| org.apache.spark.sql.catalyst.expressions.xml.XPathString | xpath_string | 
SELECT xpath_string('<a><b>b</b><c>cc</c></a>','a/c') | 
struct<xpath_string(<a><b>b</b><c>cc</c></a>, a/c):string> |
\ No newline at end of file
+| org.apache.spark.sql.catalyst.expressions.xml.XPathString | xpath_string | 
SELECT xpath_string('<a><b>b</b><c>cc</c></a>','a/c') | 
struct<xpath_string(<a><b>b</b><c>cc</c></a>, a/c):string> |
diff --git 
a/sql/core/src/test/resources/sql-tests/results/ansi/datetime.sql.out 
b/sql/core/src/test/resources/sql-tests/results/ansi/datetime.sql.out
index 86eb1f8..d42d3f4 100644
--- a/sql/core/src/test/resources/sql-tests/results/ansi/datetime.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/ansi/datetime.sql.out
@@ -160,7 +160,7 @@ NULL        2016-12-31 00:12:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(null), to_timestamp_ntz('2016-12-31 00:12:00'), 
to_timestamp_ntz('2016-12-31', 'yyyy-MM-dd')
 -- !query schema
-struct<to_timestamp_ntz(NULL):timestamp without time 
zone,to_timestamp_ntz(2016-12-31 00:12:00):timestamp without time 
zone,to_timestamp_ntz(2016-12-31, yyyy-MM-dd):timestamp without time zone>
+struct<to_timestamp_ntz(NULL):timestamp_ntz,to_timestamp_ntz(2016-12-31 
00:12:00):timestamp_ntz,to_timestamp_ntz(2016-12-31, yyyy-MM-dd):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:12:00     2016-12-31 00:00:00
 
@@ -168,7 +168,7 @@ NULL        2016-12-31 00:12:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(to_date(null)), 
to_timestamp_ntz(to_date('2016-12-31')), to_timestamp_ntz(to_date('2016-12-31', 
'yyyy-MM-dd'))
 -- !query schema
-struct<to_timestamp_ntz(to_date(NULL)):timestamp without time 
zone,to_timestamp_ntz(to_date(2016-12-31)):timestamp without time 
zone,to_timestamp_ntz(to_date(2016-12-31, yyyy-MM-dd)):timestamp without time 
zone>
+struct<to_timestamp_ntz(to_date(NULL)):timestamp_ntz,to_timestamp_ntz(to_date(2016-12-31)):timestamp_ntz,to_timestamp_ntz(to_date(2016-12-31,
 yyyy-MM-dd)):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:00:00     2016-12-31 00:00:00
 
@@ -176,7 +176,7 @@ NULL        2016-12-31 00:00:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(to_timestamp(null)), 
to_timestamp_ntz(to_timestamp('2016-12-31 00:12:00')), 
to_timestamp_ntz(to_timestamp('2016-12-31', 'yyyy-MM-dd'))
 -- !query schema
-struct<to_timestamp_ntz(to_timestamp(NULL)):timestamp without time 
zone,to_timestamp_ntz(to_timestamp(2016-12-31 00:12:00)):timestamp without time 
zone,to_timestamp_ntz(to_timestamp(2016-12-31, yyyy-MM-dd)):timestamp without 
time zone>
+struct<to_timestamp_ntz(to_timestamp(NULL)):timestamp_ntz,to_timestamp_ntz(to_timestamp(2016-12-31
 00:12:00)):timestamp_ntz,to_timestamp_ntz(to_timestamp(2016-12-31, 
yyyy-MM-dd)):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:12:00     2016-12-31 00:00:00
 
@@ -959,7 +959,7 @@ Text '2019-10-06 10:11:12.' could not be parsed at index 20
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.0', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -967,7 +967,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1
 
@@ -975,7 +975,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -983,7 +983,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz])
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123UTC', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123
 
@@ -991,7 +991,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, 
yyyy-MM-dd HH:mm:ss.SSSSSS[z
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -999,7 +999,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12345CST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12345
 
@@ -1007,7 +1007,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, 
yyyy-MM-dd HH:mm:ss.SSSSSS
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123456PST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123456
 
@@ -1024,7 +1024,7 @@ Text '2019-10-06 10:11:12.1234567PST' could not be 
parsed, unparsed text found a
 -- !query
 select to_timestamp_ntz('123456 2019-10-06 10:11:12.123456PST', 'SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(123456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(123456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123456
 
@@ -1041,7 +1041,7 @@ Text '223456 2019-10-06 10:11:12.123456PST' could not be 
parsed at index 27
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234', 'yyyy-MM-dd 
HH:mm:ss.[SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.[SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.[SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -1049,7 +1049,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, 
yyyy-MM-dd HH:mm:ss.[SSSSSS]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123', 'yyyy-MM-dd 
HH:mm:ss[.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123
 
@@ -1057,7 +1057,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123, 
yyyy-MM-dd HH:mm:ss[.SSSSSS]):t
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12', 'yyyy-MM-dd HH:mm:ss[.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1065,7 +1065,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):times
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12', 'yyyy-MM-dd 
HH:mm[:ss.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -1073,7 +1073,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12, 
yyyy-MM-dd HH:mm[:ss.SSSSSS]):ti
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11', 'yyyy-MM-dd HH:mm[:ss.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:00
 
@@ -1081,7 +1081,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestam
 -- !query
 select to_timestamp_ntz("2019-10-06S10:11:12.12345", 
"yyyy-MM-dd'S'HH:mm:ss.SSSSSS")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12345
 
@@ -1089,7 +1089,7 @@ struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS)
 -- !query
 select to_timestamp_ntz("12.12342019-10-06S10:11", "ss.SSSSyyyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -1115,7 +1115,7 @@ Text '12.1232019-10-06S10:11' could not be parsed at 
index 9
 -- !query
 select to_timestamp_ntz("12.1234019-10-06S10:11", "ss.SSSSy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 0019-10-06 10:11:12.1234
 
@@ -1123,7 +1123,7 @@ struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestam
 -- !query
 select to_timestamp_ntz("2019-10-06S", "yyyy-MM-dd'S'")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06S, yyyy-MM-dd'S'):timestamp without time 
zone>
+struct<to_timestamp_ntz(2019-10-06S, yyyy-MM-dd'S'):timestamp_ntz>
 -- !query output
 2019-10-06 00:00:00
 
@@ -1131,7 +1131,7 @@ struct<to_timestamp_ntz(2019-10-06S, 
yyyy-MM-dd'S'):timestamp without time zone>
 -- !query
 select to_timestamp_ntz("S2019-10-06", "'S'yyyy-MM-dd")
 -- !query schema
-struct<to_timestamp_ntz(S2019-10-06, 'S'yyyy-MM-dd):timestamp without time 
zone>
+struct<to_timestamp_ntz(S2019-10-06, 'S'yyyy-MM-dd):timestamp_ntz>
 -- !query output
 2019-10-06 00:00:00
 
@@ -1139,7 +1139,7 @@ struct<to_timestamp_ntz(S2019-10-06, 
'S'yyyy-MM-dd):timestamp without time zone>
 -- !query
 select to_timestamp_ntz("2019-10-06T10:11:12'12", 
"yyyy-MM-dd'T'HH:mm:ss''SSSS")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -1147,7 +1147,7 @@ struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):tim
 -- !query
 select to_timestamp_ntz("2019-10-06T10:11:12'", "yyyy-MM-dd'T'HH:mm:ss''")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1155,7 +1155,7 @@ struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp
 -- !query
 select to_timestamp_ntz("'2019-10-06T10:11:12", "''yyyy-MM-dd'T'HH:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp without time zone>
+struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1163,7 +1163,7 @@ struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp
 -- !query
 select to_timestamp_ntz("P2019-10-06T10:11:12", "'P'yyyy-MM-dd'T'HH:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp without time zone>
+struct<to_timestamp_ntz(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1188,7 +1188,7 @@ Invalid date 'February 29' as '1970' is not a leap year
 -- !query
 select to_timestamp_ntz("16", "dd")
 -- !query schema
-struct<to_timestamp_ntz(16, dd):timestamp without time zone>
+struct<to_timestamp_ntz(16, dd):timestamp_ntz>
 -- !query output
 1970-01-16 00:00:00
 
@@ -1238,7 +1238,7 @@ struct<to_timestamp(2019 10:10:10, yyyy 
hh:mm:ss):timestamp>
 -- !query
 select to_timestamp_ntz("2019 40", "yyyy mm")
 -- !query schema
-struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp without time zone>
+struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp_ntz>
 -- !query output
 2019-01-01 00:40:00
 
@@ -1246,7 +1246,7 @@ struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp 
without time zone>
 -- !query
 select to_timestamp_ntz("2019 10:10:10", "yyyy hh:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz(2019 10:10:10, yyyy hh:mm:ss):timestamp without time 
zone>
+struct<to_timestamp_ntz(2019 10:10:10, yyyy hh:mm:ss):timestamp_ntz>
 -- !query output
 2019-01-01 10:10:10
 
@@ -1503,7 +1503,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval 2 day
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '2 days':timestamp 
without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '2 days':timestamp_ntz>
 -- !query output
 2021-06-27 10:11:12
 
@@ -1511,7 +1511,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'2 days':timestamp witho
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0-0' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0-0' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0-0' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1519,7 +1519,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0-0' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '1-2' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '1-2' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '1-2' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2022-08-25 10:11:12
 
@@ -1527,7 +1527,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'1-2' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0 0:0:0' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1535,7 +1535,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0 00:00:00' DAY TO SECO
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0 0:0:0.1' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12.1
 
@@ -1543,7 +1543,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0 00:00:00.1' DAY TO SE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '10-9' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '10-9' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '10-9' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2032-03-25 10:11:12
 
@@ -1551,7 +1551,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'10-9' YEAR TO MONTH:tim
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 15' day to hour
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15' DAY TO 
HOUR:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15' DAY TO 
HOUR:timestamp_ntz>
 -- !query output
 2021-07-16 01:11:12
 
@@ -1559,7 +1559,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15' DAY TO HOUR:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 15:40' day to 
minute
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp_ntz>
 -- !query output
 2021-07-16 01:51:12
 
@@ -1567,7 +1567,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15:40' DAY TO MINUTE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 
15:40:32.99899999' day to second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp_ntz>
 -- !query output
 2021-07-16 01:51:44.998999
 
@@ -1575,7 +1575,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15:40:32.998999' DAY
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval 2 day
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '2 days':timestamp 
without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '2 days':timestamp_ntz>
 -- !query output
 2021-06-23 10:11:12
 
@@ -1583,7 +1583,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'2 days':timestamp witho
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0-0' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0-0' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0-0' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1591,7 +1591,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0-0' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '1-2' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '1-2' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '1-2' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2020-04-25 10:11:12
 
@@ -1599,7 +1599,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'1-2' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0 0:0:0' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1607,7 +1607,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0 00:00:00' DAY TO SECO
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0 0:0:0.1' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:11.9
 
@@ -1615,7 +1615,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0 00:00:00.1' DAY TO SE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '10-9' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '10-9' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '10-9' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2010-09-25 10:11:12
 
@@ -1623,7 +1623,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'10-9' YEAR TO MONTH:tim
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 15' day to hour
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15' DAY TO 
HOUR:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15' DAY TO 
HOUR:timestamp_ntz>
 -- !query output
 2021-06-04 19:11:12
 
@@ -1631,7 +1631,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'20 15' DAY TO HOUR:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 15:40' day to 
minute
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp_ntz>
 -- !query output
 2021-06-04 18:31:12
 
@@ -1639,6 +1639,6 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'20 15:40' DAY TO MINUTE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 
15:40:32.99899999' day to second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp_ntz>
 -- !query output
 2021-06-04 18:30:39.001001
diff --git 
a/sql/core/src/test/resources/sql-tests/results/datetime-legacy.sql.out 
b/sql/core/src/test/resources/sql-tests/results/datetime-legacy.sql.out
index 3ce5f02..2bf5c9f 100644
--- a/sql/core/src/test/resources/sql-tests/results/datetime-legacy.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/datetime-legacy.sql.out
@@ -154,7 +154,7 @@ NULL        2016-12-31 00:12:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(null), to_timestamp_ntz('2016-12-31 00:12:00'), 
to_timestamp_ntz('2016-12-31', 'yyyy-MM-dd')
 -- !query schema
-struct<to_timestamp_ntz(NULL):timestamp without time 
zone,to_timestamp_ntz(2016-12-31 00:12:00):timestamp without time 
zone,to_timestamp_ntz(2016-12-31, yyyy-MM-dd):timestamp without time zone>
+struct<to_timestamp_ntz(NULL):timestamp_ntz,to_timestamp_ntz(2016-12-31 
00:12:00):timestamp_ntz,to_timestamp_ntz(2016-12-31, yyyy-MM-dd):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:12:00     2016-12-31 00:00:00
 
@@ -162,7 +162,7 @@ NULL        2016-12-31 00:12:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(to_date(null)), 
to_timestamp_ntz(to_date('2016-12-31')), to_timestamp_ntz(to_date('2016-12-31', 
'yyyy-MM-dd'))
 -- !query schema
-struct<to_timestamp_ntz(to_date(NULL)):timestamp without time 
zone,to_timestamp_ntz(to_date(2016-12-31)):timestamp without time 
zone,to_timestamp_ntz(to_date(2016-12-31, yyyy-MM-dd)):timestamp without time 
zone>
+struct<to_timestamp_ntz(to_date(NULL)):timestamp_ntz,to_timestamp_ntz(to_date(2016-12-31)):timestamp_ntz,to_timestamp_ntz(to_date(2016-12-31,
 yyyy-MM-dd)):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:00:00     2016-12-31 00:00:00
 
@@ -170,7 +170,7 @@ NULL        2016-12-31 00:00:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(to_timestamp(null)), 
to_timestamp_ntz(to_timestamp('2016-12-31 00:12:00')), 
to_timestamp_ntz(to_timestamp('2016-12-31', 'yyyy-MM-dd'))
 -- !query schema
-struct<to_timestamp_ntz(to_timestamp(NULL)):timestamp without time 
zone,to_timestamp_ntz(to_timestamp(2016-12-31 00:12:00)):timestamp without time 
zone,to_timestamp_ntz(to_timestamp(2016-12-31, yyyy-MM-dd)):timestamp without 
time zone>
+struct<to_timestamp_ntz(to_timestamp(NULL)):timestamp_ntz,to_timestamp_ntz(to_timestamp(2016-12-31
 00:12:00)):timestamp_ntz,to_timestamp_ntz(to_timestamp(2016-12-31, 
yyyy-MM-dd)):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:12:00     2016-12-31 00:00:00
 
@@ -922,7 +922,7 @@ struct<to_timestamp(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp>
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12., yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12., yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 NULL
 
@@ -930,7 +930,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.0', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -938,7 +938,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1
 
@@ -946,7 +946,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -954,7 +954,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz])
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123UTC', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123
 
@@ -962,7 +962,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, 
yyyy-MM-dd HH:mm:ss.SSSSSS[z
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -970,7 +970,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12345CST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12345
 
@@ -978,7 +978,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, 
yyyy-MM-dd HH:mm:ss.SSSSSS
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123456PST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123456
 
@@ -986,7 +986,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, 
yyyy-MM-dd HH:mm:ss.SSSSS
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234567PST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234567PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234567PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 NULL
 
@@ -994,7 +994,7 @@ NULL
 -- !query
 select to_timestamp_ntz('123456 2019-10-06 10:11:12.123456PST', 'SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(123456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(123456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123456
 
@@ -1002,7 +1002,7 @@ struct<to_timestamp_ntz(123456 2019-10-06 
10:11:12.123456PST, SSSSSS yyyy-MM-dd
 -- !query
 select to_timestamp_ntz('223456 2019-10-06 10:11:12.123456PST', 'SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(223456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(223456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1010,7 +1010,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234', 'yyyy-MM-dd 
HH:mm:ss.[SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.[SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.[SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -1018,7 +1018,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, 
yyyy-MM-dd HH:mm:ss.[SSSSSS]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123', 'yyyy-MM-dd 
HH:mm:ss[.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123
 
@@ -1026,7 +1026,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123, 
yyyy-MM-dd HH:mm:ss[.SSSSSS]):t
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12', 'yyyy-MM-dd HH:mm:ss[.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1034,7 +1034,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):times
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12', 'yyyy-MM-dd 
HH:mm[:ss.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -1042,7 +1042,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12, 
yyyy-MM-dd HH:mm[:ss.SSSSSS]):ti
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11', 'yyyy-MM-dd HH:mm[:ss.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:00
 
@@ -1050,7 +1050,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestam
 -- !query
 select to_timestamp_ntz("2019-10-06S10:11:12.12345", 
"yyyy-MM-dd'S'HH:mm:ss.SSSSSS")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12345
 
@@ -1058,7 +1058,7 @@ struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS)
 -- !query
 select to_timestamp_ntz("12.12342019-10-06S10:11", "ss.SSSSyyyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -1066,7 +1066,7 @@ struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):time
 -- !query
 select to_timestamp_ntz("12.1232019-10-06S10:11", "ss.SSSSyyyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1074,7 +1074,7 @@ NULL
 -- !query
 select to_timestamp_ntz("12.1232019-10-06S10:11", "ss.SSSSyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1082,7 +1082,7 @@ NULL
 -- !query
 select to_timestamp_ntz("12.1234019-10-06S10:11", "ss.SSSSy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 0019-10-06 10:11:12.1234
 
@@ -1090,7 +1090,7 @@ struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestam
 -- !query
 select to_timestamp_ntz("2019-10-06S", "yyyy-MM-dd'S'")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06S, yyyy-MM-dd'S'):timestamp without time 
zone>
+struct<to_timestamp_ntz(2019-10-06S, yyyy-MM-dd'S'):timestamp_ntz>
 -- !query output
 2019-10-06 00:00:00
 
@@ -1098,7 +1098,7 @@ struct<to_timestamp_ntz(2019-10-06S, 
yyyy-MM-dd'S'):timestamp without time zone>
 -- !query
 select to_timestamp_ntz("S2019-10-06", "'S'yyyy-MM-dd")
 -- !query schema
-struct<to_timestamp_ntz(S2019-10-06, 'S'yyyy-MM-dd):timestamp without time 
zone>
+struct<to_timestamp_ntz(S2019-10-06, 'S'yyyy-MM-dd):timestamp_ntz>
 -- !query output
 2019-10-06 00:00:00
 
@@ -1106,7 +1106,7 @@ struct<to_timestamp_ntz(S2019-10-06, 
'S'yyyy-MM-dd):timestamp without time zone>
 -- !query
 select to_timestamp_ntz("2019-10-06T10:11:12'12", 
"yyyy-MM-dd'T'HH:mm:ss''SSSS")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -1114,7 +1114,7 @@ struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):tim
 -- !query
 select to_timestamp_ntz("2019-10-06T10:11:12'", "yyyy-MM-dd'T'HH:mm:ss''")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1122,7 +1122,7 @@ struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp
 -- !query
 select to_timestamp_ntz("'2019-10-06T10:11:12", "''yyyy-MM-dd'T'HH:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp without time zone>
+struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1130,7 +1130,7 @@ struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp
 -- !query
 select to_timestamp_ntz("P2019-10-06T10:11:12", "'P'yyyy-MM-dd'T'HH:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp without time zone>
+struct<to_timestamp_ntz(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1154,7 +1154,7 @@ NULL
 -- !query
 select to_timestamp_ntz("16", "dd")
 -- !query schema
-struct<to_timestamp_ntz(16, dd):timestamp without time zone>
+struct<to_timestamp_ntz(16, dd):timestamp_ntz>
 -- !query output
 1970-01-16 00:00:00
 
@@ -1162,7 +1162,7 @@ struct<to_timestamp_ntz(16, dd):timestamp without time 
zone>
 -- !query
 select to_timestamp_ntz("02-29", "MM-dd")
 -- !query schema
-struct<to_timestamp_ntz(02-29, MM-dd):timestamp without time zone>
+struct<to_timestamp_ntz(02-29, MM-dd):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1202,7 +1202,7 @@ struct<to_timestamp(2019 10:10:10, yyyy 
hh:mm:ss):timestamp>
 -- !query
 select to_timestamp_ntz("2019 40", "yyyy mm")
 -- !query schema
-struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp without time zone>
+struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp_ntz>
 -- !query output
 2019-01-01 00:40:00
 
@@ -1210,7 +1210,7 @@ struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp 
without time zone>
 -- !query
 select to_timestamp_ntz("2019 10:10:10", "yyyy hh:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz(2019 10:10:10, yyyy hh:mm:ss):timestamp without time 
zone>
+struct<to_timestamp_ntz(2019 10:10:10, yyyy hh:mm:ss):timestamp_ntz>
 -- !query output
 2019-01-01 10:10:10
 
@@ -1341,7 +1341,7 @@ NULL
 -- !query
 select to_timestamp_ntz("2020-01-27T20:06:11.847", "yyyy-MM-dd HH:mm:ss.SSS")
 -- !query schema
-struct<to_timestamp_ntz(2020-01-27T20:06:11.847, yyyy-MM-dd 
HH:mm:ss.SSS):timestamp without time zone>
+struct<to_timestamp_ntz(2020-01-27T20:06:11.847, yyyy-MM-dd 
HH:mm:ss.SSS):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1349,7 +1349,7 @@ NULL
 -- !query
 select to_timestamp_ntz("Unparseable", "yyyy-MM-dd HH:mm:ss.SSS")
 -- !query schema
-struct<to_timestamp_ntz(Unparseable, yyyy-MM-dd HH:mm:ss.SSS):timestamp 
without time zone>
+struct<to_timestamp_ntz(Unparseable, yyyy-MM-dd HH:mm:ss.SSS):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1445,7 +1445,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval 2 day
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '2 days':timestamp 
without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '2 days':timestamp_ntz>
 -- !query output
 2021-06-27 10:11:12
 
@@ -1453,7 +1453,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'2 days':timestamp witho
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0-0' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0-0' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0-0' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1461,7 +1461,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0-0' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '1-2' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '1-2' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '1-2' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2022-08-25 10:11:12
 
@@ -1469,7 +1469,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'1-2' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0 0:0:0' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1477,7 +1477,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0 00:00:00' DAY TO SECO
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0 0:0:0.1' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12.1
 
@@ -1485,7 +1485,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0 00:00:00.1' DAY TO SE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '10-9' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '10-9' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '10-9' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2032-03-25 10:11:12
 
@@ -1493,7 +1493,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'10-9' YEAR TO MONTH:tim
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 15' day to hour
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15' DAY TO 
HOUR:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15' DAY TO 
HOUR:timestamp_ntz>
 -- !query output
 2021-07-16 01:11:12
 
@@ -1501,7 +1501,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15' DAY TO HOUR:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 15:40' day to 
minute
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp_ntz>
 -- !query output
 2021-07-16 01:51:12
 
@@ -1509,7 +1509,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15:40' DAY TO MINUTE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 
15:40:32.99899999' day to second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp_ntz>
 -- !query output
 2021-07-16 01:51:44.998999
 
@@ -1517,7 +1517,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15:40:32.998999' DAY
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval 2 day
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '2 days':timestamp 
without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '2 days':timestamp_ntz>
 -- !query output
 2021-06-23 10:11:12
 
@@ -1525,7 +1525,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'2 days':timestamp witho
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0-0' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0-0' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0-0' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1533,7 +1533,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0-0' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '1-2' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '1-2' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '1-2' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2020-04-25 10:11:12
 
@@ -1541,7 +1541,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'1-2' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0 0:0:0' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1549,7 +1549,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0 00:00:00' DAY TO SECO
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0 0:0:0.1' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:11.9
 
@@ -1557,7 +1557,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0 00:00:00.1' DAY TO SE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '10-9' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '10-9' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '10-9' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2010-09-25 10:11:12
 
@@ -1565,7 +1565,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'10-9' YEAR TO MONTH:tim
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 15' day to hour
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15' DAY TO 
HOUR:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15' DAY TO 
HOUR:timestamp_ntz>
 -- !query output
 2021-06-04 19:11:12
 
@@ -1573,7 +1573,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'20 15' DAY TO HOUR:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 15:40' day to 
minute
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp_ntz>
 -- !query output
 2021-06-04 18:31:12
 
@@ -1581,6 +1581,6 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'20 15:40' DAY TO MINUTE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 
15:40:32.99899999' day to second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp_ntz>
 -- !query output
 2021-06-04 18:30:39.001001
diff --git a/sql/core/src/test/resources/sql-tests/results/datetime.sql.out 
b/sql/core/src/test/resources/sql-tests/results/datetime.sql.out
index 6c7115c..22dc56d 100755
--- a/sql/core/src/test/resources/sql-tests/results/datetime.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/datetime.sql.out
@@ -154,7 +154,7 @@ NULL        2016-12-31 00:12:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(null), to_timestamp_ntz('2016-12-31 00:12:00'), 
to_timestamp_ntz('2016-12-31', 'yyyy-MM-dd')
 -- !query schema
-struct<to_timestamp_ntz(NULL):timestamp without time 
zone,to_timestamp_ntz(2016-12-31 00:12:00):timestamp without time 
zone,to_timestamp_ntz(2016-12-31, yyyy-MM-dd):timestamp without time zone>
+struct<to_timestamp_ntz(NULL):timestamp_ntz,to_timestamp_ntz(2016-12-31 
00:12:00):timestamp_ntz,to_timestamp_ntz(2016-12-31, yyyy-MM-dd):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:12:00     2016-12-31 00:00:00
 
@@ -162,7 +162,7 @@ NULL        2016-12-31 00:12:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(to_date(null)), 
to_timestamp_ntz(to_date('2016-12-31')), to_timestamp_ntz(to_date('2016-12-31', 
'yyyy-MM-dd'))
 -- !query schema
-struct<to_timestamp_ntz(to_date(NULL)):timestamp without time 
zone,to_timestamp_ntz(to_date(2016-12-31)):timestamp without time 
zone,to_timestamp_ntz(to_date(2016-12-31, yyyy-MM-dd)):timestamp without time 
zone>
+struct<to_timestamp_ntz(to_date(NULL)):timestamp_ntz,to_timestamp_ntz(to_date(2016-12-31)):timestamp_ntz,to_timestamp_ntz(to_date(2016-12-31,
 yyyy-MM-dd)):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:00:00     2016-12-31 00:00:00
 
@@ -170,7 +170,7 @@ NULL        2016-12-31 00:00:00     2016-12-31 00:00:00
 -- !query
 select to_timestamp_ntz(to_timestamp(null)), 
to_timestamp_ntz(to_timestamp('2016-12-31 00:12:00')), 
to_timestamp_ntz(to_timestamp('2016-12-31', 'yyyy-MM-dd'))
 -- !query schema
-struct<to_timestamp_ntz(to_timestamp(NULL)):timestamp without time 
zone,to_timestamp_ntz(to_timestamp(2016-12-31 00:12:00)):timestamp without time 
zone,to_timestamp_ntz(to_timestamp(2016-12-31, yyyy-MM-dd)):timestamp without 
time zone>
+struct<to_timestamp_ntz(to_timestamp(NULL)):timestamp_ntz,to_timestamp_ntz(to_timestamp(2016-12-31
 00:12:00)):timestamp_ntz,to_timestamp_ntz(to_timestamp(2016-12-31, 
yyyy-MM-dd)):timestamp_ntz>
 -- !query output
 NULL   2016-12-31 00:12:00     2016-12-31 00:00:00
 
@@ -922,7 +922,7 @@ struct<to_timestamp(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp>
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12., yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12., yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 NULL
 
@@ -930,7 +930,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.0', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -938,7 +938,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.0, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1
 
@@ -946,7 +946,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -954,7 +954,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz])
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123UTC', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123
 
@@ -962,7 +962,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123UTC, 
yyyy-MM-dd HH:mm:ss.SSSSSS[z
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -970,7 +970,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12345CST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12345
 
@@ -978,7 +978,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12345CST, 
yyyy-MM-dd HH:mm:ss.SSSSSS
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123456PST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123456
 
@@ -986,7 +986,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123456PST, 
yyyy-MM-dd HH:mm:ss.SSSSS
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234567PST', 'yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234567PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234567PST, yyyy-MM-dd 
HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 NULL
 
@@ -994,7 +994,7 @@ NULL
 -- !query
 select to_timestamp_ntz('123456 2019-10-06 10:11:12.123456PST', 'SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(123456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(123456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123456
 
@@ -1002,7 +1002,7 @@ struct<to_timestamp_ntz(123456 2019-10-06 
10:11:12.123456PST, SSSSSS yyyy-MM-dd
 -- !query
 select to_timestamp_ntz('223456 2019-10-06 10:11:12.123456PST', 'SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]')
 -- !query schema
-struct<to_timestamp_ntz(223456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp without time zone>
+struct<to_timestamp_ntz(223456 2019-10-06 10:11:12.123456PST, SSSSSS 
yyyy-MM-dd HH:mm:ss.SSSSSS[zzz]):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1010,7 +1010,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.1234', 'yyyy-MM-dd 
HH:mm:ss.[SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.[SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, yyyy-MM-dd 
HH:mm:ss.[SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -1018,7 +1018,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.1234, 
yyyy-MM-dd HH:mm:ss.[SSSSSS]):
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.123', 'yyyy-MM-dd 
HH:mm:ss[.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.123, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.123, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.123
 
@@ -1026,7 +1026,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.123, 
yyyy-MM-dd HH:mm:ss[.SSSSSS]):t
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12', 'yyyy-MM-dd HH:mm:ss[.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1034,7 +1034,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12, yyyy-MM-dd 
HH:mm:ss[.SSSSSS]):times
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11:12.12', 'yyyy-MM-dd 
HH:mm[:ss.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11:12.12, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -1042,7 +1042,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11:12.12, 
yyyy-MM-dd HH:mm[:ss.SSSSSS]):ti
 -- !query
 select to_timestamp_ntz('2019-10-06 10:11', 'yyyy-MM-dd HH:mm[:ss.SSSSSS]')
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:00
 
@@ -1050,7 +1050,7 @@ struct<to_timestamp_ntz(2019-10-06 10:11, yyyy-MM-dd 
HH:mm[:ss.SSSSSS]):timestam
 -- !query
 select to_timestamp_ntz("2019-10-06S10:11:12.12345", 
"yyyy-MM-dd'S'HH:mm:ss.SSSSSS")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12345
 
@@ -1058,7 +1058,7 @@ struct<to_timestamp_ntz(2019-10-06S10:11:12.12345, 
yyyy-MM-dd'S'HH:mm:ss.SSSSSS)
 -- !query
 select to_timestamp_ntz("12.12342019-10-06S10:11", "ss.SSSSyyyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.1234
 
@@ -1066,7 +1066,7 @@ struct<to_timestamp_ntz(12.12342019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):time
 -- !query
 select to_timestamp_ntz("12.1232019-10-06S10:11", "ss.SSSSyyyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyyyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1074,7 +1074,7 @@ NULL
 -- !query
 select to_timestamp_ntz("12.1232019-10-06S10:11", "ss.SSSSyy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1232019-10-06S10:11, 
ss.SSSSyy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1082,7 +1082,7 @@ NULL
 -- !query
 select to_timestamp_ntz("12.1234019-10-06S10:11", "ss.SSSSy-MM-dd'S'HH:mm")
 -- !query schema
-struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestamp without time zone>
+struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestamp_ntz>
 -- !query output
 0019-10-06 10:11:12.1234
 
@@ -1090,7 +1090,7 @@ struct<to_timestamp_ntz(12.1234019-10-06S10:11, 
ss.SSSSy-MM-dd'S'HH:mm):timestam
 -- !query
 select to_timestamp_ntz("2019-10-06S", "yyyy-MM-dd'S'")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06S, yyyy-MM-dd'S'):timestamp without time 
zone>
+struct<to_timestamp_ntz(2019-10-06S, yyyy-MM-dd'S'):timestamp_ntz>
 -- !query output
 2019-10-06 00:00:00
 
@@ -1098,7 +1098,7 @@ struct<to_timestamp_ntz(2019-10-06S, 
yyyy-MM-dd'S'):timestamp without time zone>
 -- !query
 select to_timestamp_ntz("S2019-10-06", "'S'yyyy-MM-dd")
 -- !query schema
-struct<to_timestamp_ntz(S2019-10-06, 'S'yyyy-MM-dd):timestamp without time 
zone>
+struct<to_timestamp_ntz(S2019-10-06, 'S'yyyy-MM-dd):timestamp_ntz>
 -- !query output
 2019-10-06 00:00:00
 
@@ -1106,7 +1106,7 @@ struct<to_timestamp_ntz(S2019-10-06, 
'S'yyyy-MM-dd):timestamp without time zone>
 -- !query
 select to_timestamp_ntz("2019-10-06T10:11:12'12", 
"yyyy-MM-dd'T'HH:mm:ss''SSSS")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12.12
 
@@ -1114,7 +1114,7 @@ struct<to_timestamp_ntz(2019-10-06T10:11:12'12, 
yyyy-MM-dd'T'HH:mm:ss''SSSS):tim
 -- !query
 select to_timestamp_ntz("2019-10-06T10:11:12'", "yyyy-MM-dd'T'HH:mm:ss''")
 -- !query schema
-struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp without time zone>
+struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1122,7 +1122,7 @@ struct<to_timestamp_ntz(2019-10-06T10:11:12', 
yyyy-MM-dd'T'HH:mm:ss''):timestamp
 -- !query
 select to_timestamp_ntz("'2019-10-06T10:11:12", "''yyyy-MM-dd'T'HH:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp without time zone>
+struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1130,7 +1130,7 @@ struct<to_timestamp_ntz('2019-10-06T10:11:12, 
''yyyy-MM-dd'T'HH:mm:ss):timestamp
 -- !query
 select to_timestamp_ntz("P2019-10-06T10:11:12", "'P'yyyy-MM-dd'T'HH:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp without time zone>
+struct<to_timestamp_ntz(P2019-10-06T10:11:12, 
'P'yyyy-MM-dd'T'HH:mm:ss):timestamp_ntz>
 -- !query output
 2019-10-06 10:11:12
 
@@ -1154,7 +1154,7 @@ NULL
 -- !query
 select to_timestamp_ntz("16", "dd")
 -- !query schema
-struct<to_timestamp_ntz(16, dd):timestamp without time zone>
+struct<to_timestamp_ntz(16, dd):timestamp_ntz>
 -- !query output
 1970-01-16 00:00:00
 
@@ -1162,7 +1162,7 @@ struct<to_timestamp_ntz(16, dd):timestamp without time 
zone>
 -- !query
 select to_timestamp_ntz("02-29", "MM-dd")
 -- !query schema
-struct<to_timestamp_ntz(02-29, MM-dd):timestamp without time zone>
+struct<to_timestamp_ntz(02-29, MM-dd):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1202,7 +1202,7 @@ struct<to_timestamp(2019 10:10:10, yyyy 
hh:mm:ss):timestamp>
 -- !query
 select to_timestamp_ntz("2019 40", "yyyy mm")
 -- !query schema
-struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp without time zone>
+struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp_ntz>
 -- !query output
 2019-01-01 00:40:00
 
@@ -1210,7 +1210,7 @@ struct<to_timestamp_ntz(2019 40, yyyy mm):timestamp 
without time zone>
 -- !query
 select to_timestamp_ntz("2019 10:10:10", "yyyy hh:mm:ss")
 -- !query schema
-struct<to_timestamp_ntz(2019 10:10:10, yyyy hh:mm:ss):timestamp without time 
zone>
+struct<to_timestamp_ntz(2019 10:10:10, yyyy hh:mm:ss):timestamp_ntz>
 -- !query output
 2019-01-01 10:10:10
 
@@ -1349,7 +1349,7 @@ NULL
 -- !query
 select to_timestamp_ntz("2020-01-27T20:06:11.847", "yyyy-MM-dd HH:mm:ss.SSS")
 -- !query schema
-struct<to_timestamp_ntz(2020-01-27T20:06:11.847, yyyy-MM-dd 
HH:mm:ss.SSS):timestamp without time zone>
+struct<to_timestamp_ntz(2020-01-27T20:06:11.847, yyyy-MM-dd 
HH:mm:ss.SSS):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1357,7 +1357,7 @@ NULL
 -- !query
 select to_timestamp_ntz("Unparseable", "yyyy-MM-dd HH:mm:ss.SSS")
 -- !query schema
-struct<to_timestamp_ntz(Unparseable, yyyy-MM-dd HH:mm:ss.SSS):timestamp 
without time zone>
+struct<to_timestamp_ntz(Unparseable, yyyy-MM-dd HH:mm:ss.SSS):timestamp_ntz>
 -- !query output
 NULL
 
@@ -1453,7 +1453,7 @@ NULL
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval 2 day
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '2 days':timestamp 
without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '2 days':timestamp_ntz>
 -- !query output
 2021-06-27 10:11:12
 
@@ -1461,7 +1461,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'2 days':timestamp witho
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0-0' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0-0' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0-0' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1469,7 +1469,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0-0' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '1-2' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '1-2' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '1-2' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2022-08-25 10:11:12
 
@@ -1477,7 +1477,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'1-2' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0 0:0:0' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1485,7 +1485,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0 00:00:00' DAY TO SECO
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '0 0:0:0.1' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12.1
 
@@ -1493,7 +1493,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'0 00:00:00.1' DAY TO SE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '10-9' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '10-9' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '10-9' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2032-03-25 10:11:12
 
@@ -1501,7 +1501,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'10-9' YEAR TO MONTH:tim
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 15' day to hour
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15' DAY TO 
HOUR:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15' DAY TO 
HOUR:timestamp_ntz>
 -- !query output
 2021-07-16 01:11:12
 
@@ -1509,7 +1509,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15' DAY TO HOUR:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 15:40' day to 
minute
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp_ntz>
 -- !query output
 2021-07-16 01:51:12
 
@@ -1517,7 +1517,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15:40' DAY TO MINUTE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') + interval '20 
15:40:32.99899999' day to second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp_ntz>
 -- !query output
 2021-07-16 01:51:44.998999
 
@@ -1525,7 +1525,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) + INTERVAL 
'20 15:40:32.998999' DAY
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval 2 day
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '2 days':timestamp 
without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '2 days':timestamp_ntz>
 -- !query output
 2021-06-23 10:11:12
 
@@ -1533,7 +1533,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'2 days':timestamp witho
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0-0' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0-0' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0-0' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1541,7 +1541,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0-0' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '1-2' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '1-2' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '1-2' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2020-04-25 10:11:12
 
@@ -1549,7 +1549,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'1-2' YEAR TO MONTH:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0 0:0:0' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:12
 
@@ -1557,7 +1557,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0 00:00:00' DAY TO SECO
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '0 0:0:0.1' day to 
second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '0 00:00:00.1' DAY TO 
SECOND:timestamp_ntz>
 -- !query output
 2021-06-25 10:11:11.9
 
@@ -1565,7 +1565,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'0 00:00:00.1' DAY TO SE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '10-9' year to month
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '10-9' YEAR TO 
MONTH:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '10-9' YEAR TO 
MONTH:timestamp_ntz>
 -- !query output
 2010-09-25 10:11:12
 
@@ -1573,7 +1573,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'10-9' YEAR TO MONTH:tim
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 15' day to hour
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15' DAY TO 
HOUR:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15' DAY TO 
HOUR:timestamp_ntz>
 -- !query output
 2021-06-04 19:11:12
 
@@ -1581,7 +1581,7 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'20 15' DAY TO HOUR:time
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 15:40' day to 
minute
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40' DAY TO 
MINUTE:timestamp_ntz>
 -- !query output
 2021-06-04 18:31:12
 
@@ -1589,6 +1589,6 @@ struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL 
'20 15:40' DAY TO MINUTE
 -- !query
 select to_timestamp_ntz('2021-06-25 10:11:12') - interval '20 
15:40:32.99899999' day to second
 -- !query schema
-struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp without time zone>
+struct<to_timestamp_ntz(2021-06-25 10:11:12) - INTERVAL '20 15:40:32.998999' 
DAY TO SECOND:timestamp_ntz>
 -- !query output
 2021-06-04 18:30:39.001001

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to