Merge pull request #1478 from kdubb/more_42_310

Update LocalDateTypeHandler, LocalTimeTypeHandler and LocalDateTimeTypeHandler to use `PreparedStatement#setObject()` and `ResultSet#getObject()`.
This fixes the following potential issues.

- LocalTimeTypeHandler : fractional seconds (nanoseconds) part is lost.
- LocalDateTimeTypeHandler, LocalDateTypeHandler : value could be altered.

Author: harawata

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 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.
@@ -19,7 +19,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
 /**
@@ -31,31 +30,21 @@ public class LocalDateTimeTypeHandler extends BaseTypeHandler<LocalDateTime> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, LocalDateTime parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setTimestamp(i, Timestamp.valueOf(parameter));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public LocalDateTime getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Timestamp timestamp = rs.getTimestamp(columnName);
-    return getLocalDateTime(timestamp);
+    return rs.getObject(columnName, LocalDateTime.class);
   }
 
   @Override
   public LocalDateTime getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Timestamp timestamp = rs.getTimestamp(columnIndex);
-    return getLocalDateTime(timestamp);
+    return rs.getObject(columnIndex, LocalDateTime.class);
   }
 
   @Override
   public LocalDateTime getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Timestamp timestamp = cs.getTimestamp(columnIndex);
-    return getLocalDateTime(timestamp);
-  }
-
-  private static LocalDateTime getLocalDateTime(Timestamp timestamp) {
-    if (timestamp != null) {
-      return timestamp.toLocalDateTime();
-    }
-    return null;
+    return cs.getObject(columnIndex, LocalDateTime.class);
   }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 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.
@@ -16,7 +16,6 @@
 package org.apache.ibatis.type;
 
 import java.sql.CallableStatement;
-import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -31,31 +30,21 @@ public class LocalDateTypeHandler extends BaseTypeHandler<LocalDate> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, LocalDate parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setDate(i, Date.valueOf(parameter));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public LocalDate getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Date date = rs.getDate(columnName);
-    return getLocalDate(date);
+    return rs.getObject(columnName, LocalDate.class);
   }
 
   @Override
   public LocalDate getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Date date = rs.getDate(columnIndex);
-    return getLocalDate(date);
+    return rs.getObject(columnIndex, LocalDate.class);
   }
 
   @Override
   public LocalDate getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Date date = cs.getDate(columnIndex);
-    return getLocalDate(date);
-  }
-
-  private static LocalDate getLocalDate(Date date) {
-    if (date != null) {
-      return date.toLocalDate();
-    }
-    return null;
+    return cs.getObject(columnIndex, LocalDate.class);
   }
 }

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2018 the original author or authors.
+ *    Copyright 2009-2019 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.
@@ -19,7 +19,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Time;
 import java.time.LocalTime;
 
 /**
@@ -31,31 +30,21 @@ public class LocalTimeTypeHandler extends BaseTypeHandler<LocalTime> {
   @Override
   public void setNonNullParameter(PreparedStatement ps, int i, LocalTime parameter, JdbcType jdbcType)
           throws SQLException {
-    ps.setTime(i, Time.valueOf(parameter));
+    ps.setObject(i, parameter);
   }
 
   @Override
   public LocalTime getNullableResult(ResultSet rs, String columnName) throws SQLException {
-    Time time = rs.getTime(columnName);
-    return getLocalTime(time);
+    return rs.getObject(columnName, LocalTime.class);
   }
 
   @Override
   public LocalTime getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-    Time time = rs.getTime(columnIndex);
-    return getLocalTime(time);
+    return rs.getObject(columnIndex, LocalTime.class);
   }
 
   @Override
   public LocalTime getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
-    Time time = cs.getTime(columnIndex);
-    return getLocalTime(time);
-  }
-
-  private static LocalTime getLocalTime(Time time) {
-    if (time != null) {
-      return time.toLocalTime();
-    }
-    return null;
+    return cs.getObject(columnIndex, LocalTime.class);
   }
 }

src/test/java/org/apache/ibatis/submitted/localtime/CreateDB.sql

@@ -0,0 +1,25 @@
+--
+--    Copyright 2009-2019 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 (
+  id int,
+  t time(9)
+);
+
+insert into records (id, t) values
+(1, '11:22:33.123456789');

src/test/java/org/apache/ibatis/submitted/localtime/LocalTimeTest.java

@@ -0,0 +1,72 @@
+/**
+ *    Copyright 2009-2019 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.localtime;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.Reader;
+import java.time.LocalTime;
+
+import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.ibatis.session.SqlSessionFactoryBuilder;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class LocalTimeTest {
+
+  private static SqlSessionFactory sqlSessionFactory;
+
+  @BeforeAll
+  static void setUp() throws Exception {
+    try (Reader reader = Resources.getResourceAsReader("org/apache/ibatis/submitted/localtime/mybatis-config.xml")) {
+      sqlSessionFactory = new SqlSessionFactoryBuilder().build(reader);
+    }
+    BaseDataTest.runScript(sqlSessionFactory.getConfiguration().getEnvironment().getDataSource(),
+        "org/apache/ibatis/submitted/localtime/CreateDB.sql");
+  }
+
+  @Test
+  void shouldSelectLocalTimeWithNanoseconds() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Record record = mapper.selectById(1);
+      assertEquals(LocalTime.of(11, 22, 33, 123456789), record.getT());
+    }
+  }
+
+  @Test
+  void shouldInsertLocalTimeWithNanoseconds() {
+    LocalTime t = LocalTime.of(11, 22, 33, 123456789);
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Record record = new Record();
+      record.setId(2);
+      record.setT(t);
+      int result = mapper.insertLocalTime(record);
+      assertEquals(1, result);
+      sqlSession.commit();
+    }
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Record record = mapper.selectById(2);
+      assertEquals(t, record.getT());
+    }
+  }
+
+}

src/test/java/org/apache/ibatis/submitted/localtime/Mapper.java

@@ -0,0 +1,29 @@
+/**
+ *    Copyright 2009-2019 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.localtime;
+
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
+
+public interface Mapper {
+
+  @Select("select id, t from records where id = #{id}")
+  Record selectById(Integer id);
+
+  @Insert("insert into records (id, t) values (#{id}, #{t})")
+  int insertLocalTime(Record record);
+
+}

src/test/java/org/apache/ibatis/submitted/localtime/Record.java

@@ -0,0 +1,41 @@
+/**
+ *    Copyright 2009-2019 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.localtime;
+
+import java.time.LocalTime;
+
+public class Record {
+
+  private Integer id;
+
+  private LocalTime t;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public LocalTime getT() {
+    return t;
+  }
+
+  public void setT(LocalTime t) {
+    this.t = t;
+  }
+}

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+       Copyright 2009-2019 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:localtime" />
+        <property name="username" value="sa" />
+      </dataSource>
+    </environment>
+  </environments>
+
+  <mappers>
+    <mapper class="org.apache.ibatis.submitted.localtime.Mapper" />
+  </mappers>
+
+</configuration>

src/test/java/org/apache/ibatis/submitted/timezone_edge_case/CreateDB.sql

@@ -0,0 +1,26 @@
+--
+--    Copyright 2009-2019 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 (
+  id int,
+  ts timestamp(9),
+  d date
+);
+
+insert into records (id, ts, d) values
+(1, '2019-03-10 02:30:00', '2011-12-30');