The JDBC methods PreparedStatement.setTimestamp, setTime, and setDate with a…

The JDBC methods PreparedStatement.setTimestamp, setTime, and setDate with a calendar, and the methods ResultSet.getTimestamp, getTime, and getDate with a calendar converted the value in the wrong way, so that for some timestamps the converted value was wrong (where summertime starts, one hour per year).

h2/src/main/org/h2/util/DateTimeUtils.java

@@ -158,7 +158,7 @@ public class DateTimeUtils {
                 (int) h, (int) m, (int) s, (int) millis);
         long ms = cal.getTimeInMillis();
         Timestamp x = new Timestamp(ms);
-        x.setNanos((int) nanos);
+        x.setNanos((int) (nanos + millis * 1000000));
         return x;
     }
 
@@ -226,7 +226,7 @@ public class DateTimeUtils {
         to.set(Calendar.SECOND, from.get(Calendar.SECOND));
         to.set(Calendar.MILLISECOND, from.get(Calendar.MILLISECOND));
     }
-    
+
     /**
      * Convert the timestamp using the specified calendar.
      *