From 3393219794b38a4a68852662cc09749b5fb67270 Mon Sep 17 00:00:00 2001
From: Ashish Prasad <56514722+hash-16@users.noreply.github.com>
Date: Mon, 23 Oct 2023 13:41:16 +0530
Subject: [PATCH] Fix Implicit cast from datetimeoffset to other date/time
 datatypes. (#1927)

Due to implicit cast from datetimeoffset to datetime we are getting wrong output

--- AT TIME ZONE returns datetimeoffset

DECLARE @lvDateEastern DATETIME, @lvDateUTC DATETIME
SET @lvDateUTC = '2021-01-01'
SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
SELECT @lvDateUTC, @lvDateEastern

@lvDateUTC              @lvDateEastern
----------------------- -----------------------
2021-01-01 00:00:00.000 2021-01-01 00:00:00.000

Expected
----------------------- -----------------------
2021-01-01 00:00:00.000 2020-12-31 19:00:00.000
The above same issue is occuring when we are doing implicit cast from datetimeoffset to time,date,smalldatetime,datetime2.

Fixed this issue by excluding the timezone offset addition/subtraction to the original timestamp .

Issues Resolved : BABEL-986
Signed-off-by: Ashish Prasad <pashisht@amazon.com>
---
 .../babelfishpg_common/src/datetimeoffset.c   | 10 +--
 test/JDBC/expected/BABEL-3474-vu-verify.out   |  2 +-
 .../expected/TestDatetimeoffset-vu-verify.out | 16 ++--
 .../babel_datatype_sqlvariant-vu-verify.out   |  2 +-
 .../expected/babel_datatype_sqlvariant.out    |  2 +-
 .../expected/babel_datetime-vu-verify.out     |  6 +-
 test/JDBC/expected/babel_datetime.out         |  6 +-
 test/JDBC/expected/babel_datetime2.out        | 10 +--
 test/JDBC/expected/babel_datetimeoffset.out   | 87 +++++++++++++++++--
 test/JDBC/expected/babel_smalldatetime.out    | 13 +--
 ...up__13_6__TestDatetimeoffset-vu-verify.out | 16 ++--
 ...leanup__13_6__babel_datetime-vu-verify.out |  6 +-
 ...up__13_9__TestDatetimeoffset-vu-verify.out | 16 ++--
 ...leanup__13_9__babel_datetime-vu-verify.out |  6 +-
 ...up__14_3__TestDatetimeoffset-vu-verify.out | 16 ++--
 ...leanup__14_3__babel_datetime-vu-verify.out |  6 +-
 test/JDBC/input/babel_datetimeoffset.sql      | 39 +++++++++
 17 files changed, 182 insertions(+), 77 deletions(-)

diff --git a/contrib/babelfishpg_common/src/datetimeoffset.c b/contrib/babelfishpg_common/src/datetimeoffset.c
index 312da22007..61b06a6e99 100644
--- a/contrib/babelfishpg_common/src/datetimeoffset.c
+++ b/contrib/babelfishpg_common/src/datetimeoffset.c
@@ -511,7 +511,7 @@ datetimeoffset_smalldatetime(PG_FUNCTION_ARGS)
 	tsql_datetimeoffset *df = PG_GETARG_DATETIMEOFFSET(0);
 	Timestamp	result;
 
-	datetimeoffset_timestamp_internal(df, &result);
+	result = df->tsql_ts;
 	CheckSmalldatetimeRange(result);
 	AdjustTimestampForSmallDatetime(&result);
 
@@ -544,7 +544,7 @@ datetimeoffset_datetime(PG_FUNCTION_ARGS)
 	tsql_datetimeoffset *df = PG_GETARG_DATETIMEOFFSET(0);
 	Timestamp	result;
 
-	datetimeoffset_timestamp_internal(df, &result);
+	result = df->tsql_ts;
 	CheckDatetimeRange(result);
 
 	PG_RETURN_TIMESTAMP(result);
@@ -576,7 +576,7 @@ datetimeoffset_datetime2(PG_FUNCTION_ARGS)
 	tsql_datetimeoffset *df = PG_GETARG_DATETIMEOFFSET(0);
 	Timestamp	result;
 
-	datetimeoffset_timestamp_internal(df, &result);
+	result = df->tsql_ts;
 	CheckDatetime2Range(result);
 
 	PG_RETURN_TIMESTAMP(result);
@@ -644,7 +644,7 @@ datetimeoffset_date(PG_FUNCTION_ARGS)
 	int			tz;
 	DateADT		result;
 
-	datetimeoffset_timestamp_internal(df, &time);
+	time = df->tsql_ts;
 	if (timestamp2tm(time, &tz, tm, &fsec, NULL, NULL) != 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
@@ -665,7 +665,7 @@ datetimeoffset_time(PG_FUNCTION_ARGS)
 	Timestamp	time;
 	TimeADT		result;
 
-	datetimeoffset_timestamp_internal(df, &time);
+	time = df->tsql_ts;
 	if (time < 0)
 		result = time - (time / USECS_PER_DAY * USECS_PER_DAY) + USECS_PER_DAY;
 	else
diff --git a/test/JDBC/expected/BABEL-3474-vu-verify.out b/test/JDBC/expected/BABEL-3474-vu-verify.out
index 7909190f81..aee4ecdf9d 100644
--- a/test/JDBC/expected/BABEL-3474-vu-verify.out
+++ b/test/JDBC/expected/BABEL-3474-vu-verify.out
@@ -396,7 +396,7 @@ SELECT BABEL_3474_vu_prepare_f13()
 GO
 ~~START~~
 date
-2016-12-26
+2016-12-27
 ~~END~~
 
 DROP FUNCTION BABEL_3474_vu_prepare_f13
diff --git a/test/JDBC/expected/TestDatetimeoffset-vu-verify.out b/test/JDBC/expected/TestDatetimeoffset-vu-verify.out
index 2b51164ec6..3499bd7a22 100644
--- a/test/JDBC/expected/TestDatetimeoffset-vu-verify.out
+++ b/test/JDBC/expected/TestDatetimeoffset-vu-verify.out
@@ -293,14 +293,14 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime);
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99' AS datetime2) AS datetimeoffset);
@@ -314,7 +314,7 @@ select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS datetime2
 go
 ~~START~~
 datetime2
-1900-05-06 21:59:29.9980000
+1900-05-06 13:59:29.9980000
 ~~END~~
 
 
@@ -381,7 +381,7 @@ select CAST(CAST('1900-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99 +0' AS datetimeoffset) AS time);
@@ -416,7 +416,7 @@ select CAST(CAST('2050-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 
@@ -425,21 +425,21 @@ select CAST(CAST('2000-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS smalldate
 go
 ~~START~~
 smalldatetime
-2000-06-07 09:29:00.0
+2000-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-2079-06-06 15:59:00.0
+2079-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-1900-05-06 21:59:00.0
+1900-05-06 13:59:00.0
 ~~END~~
 
 select CAST(CAST('2020-03-15 23:59:29.99' AS smalldatetime) AS datetimeoffset);
diff --git a/test/JDBC/expected/babel_datatype_sqlvariant-vu-verify.out b/test/JDBC/expected/babel_datatype_sqlvariant-vu-verify.out
index 813d24a26a..ac1d6e4227 100644
--- a/test/JDBC/expected/babel_datatype_sqlvariant-vu-verify.out
+++ b/test/JDBC/expected/babel_datatype_sqlvariant-vu-verify.out
@@ -249,7 +249,7 @@ select cast(cast(cast('2020-10-05 09:00:00-9:00' as datetimeoffset) as sql_varia
 go
 ~~START~~
 datetime2
-2020-10-05 18:00:00.0000000
+2020-10-05 09:00:00.0000000
 ~~END~~
 
 -- datetime2 2 datetimeoffset
diff --git a/test/JDBC/expected/babel_datatype_sqlvariant.out b/test/JDBC/expected/babel_datatype_sqlvariant.out
index 7171622f31..113efdfc51 100644
--- a/test/JDBC/expected/babel_datatype_sqlvariant.out
+++ b/test/JDBC/expected/babel_datatype_sqlvariant.out
@@ -456,7 +456,7 @@ select cast(cast(cast('2020-10-05 09:00:00-9:00' as datetimeoffset) as sql_varia
 go
 ~~START~~
 datetime2
-2020-10-05 18:00:00.0000000
+2020-10-05 09:00:00.0000000
 ~~END~~
 
 -- datetime2 2 datetimeoffset
diff --git a/test/JDBC/expected/babel_datetime-vu-verify.out b/test/JDBC/expected/babel_datetime-vu-verify.out
index 99dde07be1..5dc05ac267 100644
--- a/test/JDBC/expected/babel_datetime-vu-verify.out
+++ b/test/JDBC/expected/babel_datetime-vu-verify.out
@@ -194,21 +194,21 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:12.347
+2079-06-06 23:59:12.347
 ~~END~~
 
 -- out of range
diff --git a/test/JDBC/expected/babel_datetime.out b/test/JDBC/expected/babel_datetime.out
index d1f3e83c60..fc88466a1b 100644
--- a/test/JDBC/expected/babel_datetime.out
+++ b/test/JDBC/expected/babel_datetime.out
@@ -238,21 +238,21 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:12.347
+2079-06-06 23:59:12.347
 ~~END~~
 
 -- out of range
diff --git a/test/JDBC/expected/babel_datetime2.out b/test/JDBC/expected/babel_datetime2.out
index afb056714c..df31d17cd4 100644
--- a/test/JDBC/expected/babel_datetime2.out
+++ b/test/JDBC/expected/babel_datetime2.out
@@ -423,35 +423,35 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime2
 go
 ~~START~~
 datetime2
-2079-06-06 15:59:29.9980000
+2079-06-06 23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime2);
 go
 ~~START~~
 datetime2
-2079-06-07 09:29:29.9980000
+2079-06-06 23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime2);
 go
 ~~START~~
 datetime2
-2079-06-07 09:29:12.3456780
+2079-06-06 23:59:12.3456780
 ~~END~~
 
 select CAST(CAST('0001-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime2);
 go
 ~~START~~
 datetime2
-0001-06-07 09:29:12.3456780
+0001-06-06 23:59:12.3456780
 ~~END~~
 
 select CAST(CAST('0001-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime2(5));
 go
 ~~START~~
 datetime2
-0001-06-07 09:29:12.34568
+0001-06-06 23:59:12.34568
 ~~END~~
 
 
diff --git a/test/JDBC/expected/babel_datetimeoffset.out b/test/JDBC/expected/babel_datetimeoffset.out
index 9bb85835a5..24fa9a2eeb 100644
--- a/test/JDBC/expected/babel_datetimeoffset.out
+++ b/test/JDBC/expected/babel_datetimeoffset.out
@@ -343,14 +343,14 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime);
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99' AS datetime2) AS datetimeoffset);
@@ -364,7 +364,7 @@ select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS datetime2
 go
 ~~START~~
 datetime2
-1900-05-06 21:59:29.9980000
+1900-05-06 13:59:29.9980000
 ~~END~~
 
 
@@ -431,7 +431,7 @@ select CAST(CAST('1900-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99 +0' AS datetimeoffset) AS time);
@@ -466,7 +466,7 @@ select CAST(CAST('2050-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 
@@ -475,21 +475,21 @@ select CAST(CAST('2000-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS smalldate
 go
 ~~START~~
 smalldatetime
-2000-06-07 09:29:00.0
+2000-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-2079-06-06 15:59:00.0
+2079-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-1900-05-06 21:59:00.0
+1900-05-06 13:59:00.0
 ~~END~~
 
 select CAST(CAST('2020-03-15 23:59:29.99' AS smalldatetime) AS datetimeoffset);
@@ -932,11 +932,82 @@ DECLARE @dto datetimeoffset = CAST('1930-05-06 13:39:29.123456 +0:00' AS datetim
 exec cmp_datetimeoffset @dto;
 go
 
+DECLARE @lvDateEastern DATETIME, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+~~START~~
+datetime#!#datetime
+2021-01-01 00:00:00.0#!#2020-12-31 19:00:00.0
+~~END~~
+
+
+DECLARE @lvDateEastern DATETIME2, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+~~START~~
+datetime#!#datetime2
+2021-01-01 00:00:00.0#!#2020-12-31 19:00:00.0000000
+~~END~~
+
+
+DECLARE @lvDateEastern SMALLDATETIME, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+~~START~~
+datetime#!#smalldatetime
+2021-01-01 00:00:00.0#!#2020-12-31 19:00:00.0
+~~END~~
+
+
+DECLARE @lvDateEastern DATE, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+~~START~~
+datetime#!#date
+2021-01-01 00:00:00.0#!#2020-12-31
+~~END~~
+
+
+DECLARE @lvDateEastern TIME, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+~~START~~
+datetime#!#time
+2021-01-01 00:00:00.0#!#19:00:00.0000000
+~~END~~
+
+
+Create table implicit_cast ( a datetime)
+go
+insert into implicit_cast values (cast('1900-05-06 13:59:29.998 -8:00' as datetimeoffset))
+go
+~~ROW COUNT: 1~~
+
+Select * from implicit_cast
+go
+~~START~~
+datetime
+1900-05-06 13:59:29.997
+~~END~~
+
+
 -- Clean up
 drop table datetimeoffset_testing;
 go
 drop table t1;
 go
+drop table implicit_cast;
+go
 drop procedure cast_datetimeoffset;
 go
 drop procedure cmp_datetimeoffset;
diff --git a/test/JDBC/expected/babel_smalldatetime.out b/test/JDBC/expected/babel_smalldatetime.out
index a0db023e2c..9e3dd9dd9c 100644
--- a/test/JDBC/expected/babel_smalldatetime.out
+++ b/test/JDBC/expected/babel_smalldatetime.out
@@ -149,22 +149,22 @@ smalldatetime
 
 ~~START~~
 smalldatetime
-1980-07-08 15:59:00.0
+1980-07-08 23:59:00.0
 ~~END~~
 
 ~~START~~
 smalldatetime
-2010-07-08 15:59:00.0
+2010-07-08 23:59:00.0
 ~~END~~
 
 ~~START~~
 smalldatetime
-1980-07-09 07:59:00.0
+1980-07-08 23:59:00.0
 ~~END~~
 
 ~~START~~
 smalldatetime
-2010-07-09 07:59:00.0
+2010-07-08 23:59:00.0
 ~~END~~
 
 -- Cast from smalldatetime
@@ -289,11 +289,6 @@ smalldatetime
 1900-01-01 00:00:00.0
 ~~END~~
 
-~~START~~
-smalldatetime
-2079-06-06 23:00:00.0
-~~END~~
-
 ~~ERROR (Code: 33557097)~~
 
 ~~ERROR (Message: data out of range for smalldatetime)~~
diff --git a/test/JDBC/expected/latest__verification_cleanup__13_6__TestDatetimeoffset-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__13_6__TestDatetimeoffset-vu-verify.out
index 0941ca14c3..ff7b640414 100644
--- a/test/JDBC/expected/latest__verification_cleanup__13_6__TestDatetimeoffset-vu-verify.out
+++ b/test/JDBC/expected/latest__verification_cleanup__13_6__TestDatetimeoffset-vu-verify.out
@@ -293,14 +293,14 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime);
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99' AS datetime2) AS datetimeoffset);
@@ -314,7 +314,7 @@ select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS datetime2
 go
 ~~START~~
 datetime2
-1900-05-06 21:59:29.9980000
+1900-05-06 13:59:29.9980000
 ~~END~~
 
 
@@ -381,7 +381,7 @@ select CAST(CAST('1900-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99 +0' AS datetimeoffset) AS time);
@@ -416,7 +416,7 @@ select CAST(CAST('2050-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 
@@ -425,21 +425,21 @@ select CAST(CAST('2000-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS smalldate
 go
 ~~START~~
 smalldatetime
-2000-06-07 09:29:00.0
+2000-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-2079-06-06 15:59:00.0
+2079-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-1900-05-06 21:59:00.0
+1900-05-06 13:59:00.0
 ~~END~~
 
 select CAST(CAST('2020-03-15 23:59:29.99' AS smalldatetime) AS datetimeoffset);
diff --git a/test/JDBC/expected/latest__verification_cleanup__13_6__babel_datetime-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__13_6__babel_datetime-vu-verify.out
index beb8038af8..de673fd4ae 100644
--- a/test/JDBC/expected/latest__verification_cleanup__13_6__babel_datetime-vu-verify.out
+++ b/test/JDBC/expected/latest__verification_cleanup__13_6__babel_datetime-vu-verify.out
@@ -194,21 +194,21 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:12.347
+2079-06-06 23:59:12.347
 ~~END~~
 
 -- out of range
diff --git a/test/JDBC/expected/latest__verification_cleanup__13_9__TestDatetimeoffset-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__13_9__TestDatetimeoffset-vu-verify.out
index 0941ca14c3..ff7b640414 100644
--- a/test/JDBC/expected/latest__verification_cleanup__13_9__TestDatetimeoffset-vu-verify.out
+++ b/test/JDBC/expected/latest__verification_cleanup__13_9__TestDatetimeoffset-vu-verify.out
@@ -293,14 +293,14 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime);
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99' AS datetime2) AS datetimeoffset);
@@ -314,7 +314,7 @@ select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS datetime2
 go
 ~~START~~
 datetime2
-1900-05-06 21:59:29.9980000
+1900-05-06 13:59:29.9980000
 ~~END~~
 
 
@@ -381,7 +381,7 @@ select CAST(CAST('1900-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99 +0' AS datetimeoffset) AS time);
@@ -416,7 +416,7 @@ select CAST(CAST('2050-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 
@@ -425,21 +425,21 @@ select CAST(CAST('2000-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS smalldate
 go
 ~~START~~
 smalldatetime
-2000-06-07 09:29:00.0
+2000-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-2079-06-06 15:59:00.0
+2079-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-1900-05-06 21:59:00.0
+1900-05-06 13:59:00.0
 ~~END~~
 
 select CAST(CAST('2020-03-15 23:59:29.99' AS smalldatetime) AS datetimeoffset);
diff --git a/test/JDBC/expected/latest__verification_cleanup__13_9__babel_datetime-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__13_9__babel_datetime-vu-verify.out
index beb8038af8..de673fd4ae 100644
--- a/test/JDBC/expected/latest__verification_cleanup__13_9__babel_datetime-vu-verify.out
+++ b/test/JDBC/expected/latest__verification_cleanup__13_9__babel_datetime-vu-verify.out
@@ -194,21 +194,21 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:12.347
+2079-06-06 23:59:12.347
 ~~END~~
 
 -- out of range
diff --git a/test/JDBC/expected/latest__verification_cleanup__14_3__TestDatetimeoffset-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_3__TestDatetimeoffset-vu-verify.out
index 0941ca14c3..ff7b640414 100644
--- a/test/JDBC/expected/latest__verification_cleanup__14_3__TestDatetimeoffset-vu-verify.out
+++ b/test/JDBC/expected/latest__verification_cleanup__14_3__TestDatetimeoffset-vu-verify.out
@@ -293,14 +293,14 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime);
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99' AS datetime2) AS datetimeoffset);
@@ -314,7 +314,7 @@ select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS datetime2
 go
 ~~START~~
 datetime2
-1900-05-06 21:59:29.9980000
+1900-05-06 13:59:29.9980000
 ~~END~~
 
 
@@ -381,7 +381,7 @@ select CAST(CAST('1900-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 select CAST(CAST('1920-05-25 00:59:29.99 +0' AS datetimeoffset) AS time);
@@ -416,7 +416,7 @@ select CAST(CAST('2050-05-06 23:59:29.998+8:00' AS datetimeoffset) AS time);
 go
 ~~START~~
 time
-15:59:29.9980000
+23:59:29.9980000
 ~~END~~
 
 
@@ -425,21 +425,21 @@ select CAST(CAST('2000-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS smalldate
 go
 ~~START~~
 smalldatetime
-2000-06-07 09:29:00.0
+2000-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-2079-06-06 15:59:00.0
+2079-06-06 23:59:00.0
 ~~END~~
 
 select CAST(CAST('1900-05-06 13:59:29.998 -8:00' AS datetimeoffset) AS smalldatetime);
 go
 ~~START~~
 smalldatetime
-1900-05-06 21:59:00.0
+1900-05-06 13:59:00.0
 ~~END~~
 
 select CAST(CAST('2020-03-15 23:59:29.99' AS smalldatetime) AS datetimeoffset);
diff --git a/test/JDBC/expected/latest__verification_cleanup__14_3__babel_datetime-vu-verify.out b/test/JDBC/expected/latest__verification_cleanup__14_3__babel_datetime-vu-verify.out
index beb8038af8..de673fd4ae 100644
--- a/test/JDBC/expected/latest__verification_cleanup__14_3__babel_datetime-vu-verify.out
+++ b/test/JDBC/expected/latest__verification_cleanup__14_3__babel_datetime-vu-verify.out
@@ -194,21 +194,21 @@ select CAST(CAST('2079-06-06 23:59:29.998 +8:00' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-06 15:59:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:29.998 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:29.997
+2079-06-06 23:59:29.997
 ~~END~~
 
 select CAST(CAST('2079-06-06 23:59:12.345678 -9:30' AS datetimeoffset) AS datetime)
 go
 ~~START~~
 datetime
-2079-06-07 09:29:12.347
+2079-06-06 23:59:12.347
 ~~END~~
 
 -- out of range
diff --git a/test/JDBC/input/babel_datetimeoffset.sql b/test/JDBC/input/babel_datetimeoffset.sql
index fde4171098..3001f08b24 100644
--- a/test/JDBC/input/babel_datetimeoffset.sql
+++ b/test/JDBC/input/babel_datetimeoffset.sql
@@ -337,11 +337,50 @@ DECLARE @dto datetimeoffset = CAST('1930-05-06 13:39:29.123456 +0:00' AS datetim
 exec cmp_datetimeoffset @dto;
 go
 
+DECLARE @lvDateEastern DATETIME, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+
+DECLARE @lvDateEastern DATETIME2, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+
+DECLARE @lvDateEastern SMALLDATETIME, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+
+DECLARE @lvDateEastern DATE, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+
+DECLARE @lvDateEastern TIME, @lvDateUTC DATETIME
+SET @lvDateUTC = '2021-01-01'
+SET @lvDateEastern = @lvDateUTC AT TIME ZONE  'UTC' AT TIME ZONE 'US Eastern Standard Time'
+SELECT @lvDateUTC, @lvDateEastern
+go
+
+Create table implicit_cast ( a datetime)
+go
+insert into implicit_cast values (cast('1900-05-06 13:59:29.998 -8:00' as datetimeoffset))
+go
+Select * from implicit_cast
+go
+
 -- Clean up
 drop table datetimeoffset_testing;
 go
 drop table t1;
 go
+drop table implicit_cast;
+go
 drop procedure cast_datetimeoffset;
 go
 drop procedure cmp_datetimeoffset;