Testing OffsetDateTimeHandler which retains Offset from UTC

src/main/java/org/apache/ibatis/type/JdbcType.java

@@ -65,7 +65,9 @@ public enum JdbcType {
   ROWID(Types.ROWID), // JDK6
   LONGNVARCHAR(Types.LONGNVARCHAR), // JDK6
   SQLXML(Types.SQLXML), // JDK6
-  DATETIMEOFFSET(-155); // SQL Server 2008
+  DATETIMEOFFSET(-155), // SQL Server 2008
+  TIME_WITH_TIMEZONE(Types.TIME_WITH_TIMEZONE), // JDBC 4.2 JDK8
+  TIMESTAMP_WITH_TIMEZONE(Types.TIMESTAMP_WITH_TIMEZONE); // JDBC 4.2 JDK8
 
   public final int TYPE_CODE;
   private static Map<Integer,JdbcType> codeLookup = new HashMap<>();

src/main/java/org/apache/ibatis/type/OffsetDateTimeTypeHandler.java

@@ -20,6 +20,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.sql.Types;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 
@@ -32,31 +33,23 @@ public class OffsetDateTimeTypeHandler extends BaseTypeHandler<OffsetDateTime> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, OffsetDateTime parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setTimestamp(i, Timestamp.from(parameter.toInstant()));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public OffsetDateTime getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Timestamp timestamp = rs.getTimestamp(columnName);
-    return getOffsetDateTime(timestamp);
+    return (OffsetDateTime) rs.getObject(columnName);
   }
 
   @Override
   public OffsetDateTime getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Timestamp timestamp = rs.getTimestamp(columnIndex);
-    return getOffsetDateTime(timestamp);
+    return (OffsetDateTime) rs.getObject(columnIndex);
   }
 
   @Override
   public OffsetDateTime getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Timestamp timestamp = cs.getTimestamp(columnIndex);
-    return getOffsetDateTime(timestamp);
+    return (OffsetDateTime) cs.getObject(columnIndex);
   }
 
-  private static OffsetDateTime getOffsetDateTime(Timestamp timestamp) {
-    if (timestamp != null) {
-      return OffsetDateTime.ofInstant(timestamp.toInstant(), ZoneId.systemDefault());
-    }
-    return null;
-  }
+
 }

src/test/java/org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/CreateDB.sql

@@ -0,0 +1,25 @@
+--
+--    Copyright 2009-2017 the original author or authors.
+--
+--    Licensed under the Apache License, Version 2.0 (the "License");
+--    you may not use this file except in compliance with the License.
+--    You may obtain a copy of the License at
+--
+--       http://www.apache.org/licenses/LICENSE-2.0
+--
+--    Unless required by applicable law or agreed to in writing, software
+--    distributed under the License is distributed on an "AS IS" BASIS,
+--    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--    See the License for the specific language governing permissions and
+--    limitations under the License.
+--
+
+drop table records if exists;
+
+create table records (
+  datetime timestamp with time zone
+);
+
+insert into records values ('2017-08-20 20:00:00+02:00');  
+insert into records values ('2017-08-20 20:00:00-04:00'); 
+

src/test/java/org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/Mapper.java

@@ -0,0 +1,28 @@
+/**
+ *    Copyright 2009-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.submitted.usesjava8.timestamp_with_timezone;
+
+import org.apache.ibatis.submitted.usesjava8.use_actual_param_name.*;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Select;
+
+public interface Mapper {
+
+  @Select("select * from records")
+  List<Record> selectAll();
+
+}

src/test/java/org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/Mapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       Copyright 2009-2017 the original author or authors.
+
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+
+-->
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.apache.ibatis.submitted.usesjava8.timestamp_with_timezone.Mapper">
+
+</mapper>

src/test/java/org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/OffsetDateTimeTypeHandlerTest.java

@@ -0,0 +1,75 @@
+/**
+ *    Copyright 2009-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.submitted.usesjava8.timestamp_with_timezone;
+
+
+import java.io.Reader;
+import java.sql.Connection;
+import java.util.List;
+
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.apache.ibatis.submitted.usesjava8.use_actual_param_name.User;
+import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class OffsetDateTimeTypeHandlerTest {
+
+  private static SqlSessionFactory sqlSessionFactory;
+
+  @BeforeClass
+  public static void setUp() throws Exception {
+    // create an SqlSessionFactory
+    Reader reader = Resources.getResourceAsReader(
+        "org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/mybatis-config.xml");
+    sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    reader.close();
+
+    // populate in-memory database
+    SqlSession session = sqlSessionFactory.openSession();
+    Connection conn = session.getConnection();
+    reader = Resources.getResourceAsReader(
+        "org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/CreateDB.sql");
+    ScriptRunner runner = new ScriptRunner(conn);
+    runner.setLogWriter(null);
+    runner.runScript(reader);
+    conn.close();
+    reader.close();
+    session.close();
+  }
+
+  @Test
+  public void shouldPreserveDateTimeWithOffset() {
+    SqlSession sqlSession = sqlSessionFactory.openSession();
+    try {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      List<Record> records = mapper.selectAll();
+
+      for (Record record : records) {
+        System.out.println(record.getDatetime());
+      }
+
+    } finally {
+      sqlSession.close();
+    }
+  }  
+
+}

src/test/java/org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/Record.java

@@ -0,0 +1,32 @@
+/**
+ *    Copyright 2009-2017 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.apache.ibatis.submitted.usesjava8.timestamp_with_timezone;
+
+import java.time.OffsetDateTime;
+
+public class Record {
+
+  private OffsetDateTime datetime;
+
+  public OffsetDateTime getDatetime() {
+    return datetime;
+  }
+
+  public void setDatetime(OffsetDateTime datetime) {
+    this.datetime = datetime;
+  }
+
+}

src/test/java/org/apache/ibatis/submitted/usesjava8/timestamp_with_timezone/mybatis-config.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+       Copyright 2009-2017 the original author or authors.
+
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+
+-->
+<!DOCTYPE configuration
+    PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-config.dtd">
+
+<configuration>
+
+  <environments default="development">
+    <environment id="development">
+      <transactionManager type="JDBC">
+        <property name="" value="" />
+      </transactionManager>
+      <dataSource type="UNPOOLED">
+        <property name="driver" value="org.hsqldb.jdbcDriver" />
+        <property name="url" value="jdbc:hsqldb:mem:timestampwithtimzeone" />
+        <property name="username" value="sa" />
+      </dataSource>
+    </environment>
+  </environments>
+
+  <mappers>
+    <mapper class="org.apache.ibatis.submitted.usesjava8.timestamp_with_timezone.Mapper" />
+  </mappers>
+
+</configuration>