From 1b06b76e17a41b977a43c48551c3a844704044e7 Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Mon, 12 Aug 2019 19:38:09 -0700
Subject: [PATCH] HHH-13557 : LocalTimeTest#writeThenNativeRead and
 OffsetTimeTest#writeThenNativeRead tests are failing on SQL Server

---
 .../test/java/org/hibernate/test/type/LocalTimeTest.java   | 7 ++++++-
 .../test/java/org/hibernate/test/type/OffsetTimeTest.java  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java
index 9c80a3eba1..e4139ed48c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/type/LocalTimeTest.java
@@ -175,7 +175,12 @@ public class LocalTimeTest extends AbstractJavaTimeTypeTest<LocalTime, LocalTime
 
 	@Override
 	protected Object getActualJdbcValue(ResultSet resultSet, int columnIndex) throws SQLException {
-		return resultSet.getTimestamp( columnIndex );
+		if ( TimeAsTimestampRemappingH2Dialect.class.equals( getRemappingDialectClass() ) ) {
+			return resultSet.getTimestamp( columnIndex );
+		}
+		else {
+			return resultSet.getTime( columnIndex );
+		}
 	}
 
 	@Override
diff --git a/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java b/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java
index e7a2066f95..1d12f7f9ff 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/type/OffsetTimeTest.java
@@ -204,7 +204,12 @@ public class OffsetTimeTest extends AbstractJavaTimeTypeTest<OffsetTime, OffsetT
 
 	@Override
 	protected Object getActualJdbcValue(ResultSet resultSet, int columnIndex) throws SQLException {
-		return resultSet.getTimestamp( columnIndex );
+		if ( TimeAsTimestampRemappingH2Dialect.class.equals( getRemappingDialectClass() ) ) {
+			return resultSet.getTimestamp( columnIndex );
+		}
+		else {
+			return resultSet.getTime( columnIndex );
+		}
 	}
 
 	@Override