Merge pull request #1355 from katzyn/meta

Assorted changes in MetaTable

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

@@ -21,17 +21,7 @@ public final class CurrentTimestamp {
      * @return current timestamp
      */
     public static ValueTimestampTimeZone get() {
-        long ms = System.currentTimeMillis();
-        /*
-         * This code intentionally does not support properly dates before UNIX
-         * epoch and time zone offsets with seconds because such support is not
-         * required for current dates.
-         */
-        int offset = DateTimeUtils.getTimeZone().getOffset(ms);
-        ms += offset;
-        return ValueTimestampTimeZone.fromDateValueAndNanos(
-                DateTimeUtils.dateValueFromAbsoluteDay(ms / DateTimeUtils.MILLIS_PER_DAY),
-                ms % DateTimeUtils.MILLIS_PER_DAY * 1_000_000, (short) (offset / 60_000));
+        return DateTimeUtils.timestampTimeZoneFromMillis(System.currentTimeMillis());
     }
 
     private CurrentTimestamp() {

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

@@ -1163,6 +1163,24 @@ public class DateTimeUtils {
         return ValueTimestampTimeZone.fromDateValueAndNanos(dateValue, timeNanos, (short) offsetMins);
     }
 
+    /**
+     * @param ms milliseconds since 1970-01-01 (UTC)
+     * @return timestamp with time zone with specified value and current time zone
+     */
+    public static ValueTimestampTimeZone timestampTimeZoneFromMillis(long ms) {
+        int offset = getTimeZone().getOffset(ms);
+        ms += offset;
+        long absoluteDay = ms / MILLIS_PER_DAY;
+        // Round toward negative infinity
+        if (ms < 0 && (absoluteDay * MILLIS_PER_DAY != ms)) {
+            absoluteDay--;
+        }
+        return ValueTimestampTimeZone.fromDateValueAndNanos(
+                dateValueFromAbsoluteDay(absoluteDay),
+                (ms - absoluteDay * MILLIS_PER_DAY) * 1_000_000,
+                (short) (offset / 60_000));
+    }
+
     /**
      * Calculate the absolute day for a January, 1 of the specified year.
      *