Fix column type for EXTRACT with EPOCH

h2/src/main/org/h2/expression/Function.java

@@ -2197,6 +2197,20 @@ public class Function extends Expression implements FunctionCall {
         long p;
         Expression p0 = args.length < 1 ? null : args[0];
         switch (info.type) {
+        case EXTRACT: {
+            if (p0.isConstant() && DateTimeFunctions.getDatePart(p0.getValue(session).getString()) == Function.EPOCH) {
+                t = Value.DECIMAL;
+                p = ValueLong.PRECISION + ValueTimestamp.MAXIMUM_SCALE;
+                s = ValueTimestamp.MAXIMUM_SCALE;
+                d = ValueLong.PRECISION + ValueTimestamp.MAXIMUM_SCALE + 1;
+            } else {
+                t = Value.INT;
+                p = ValueInt.PRECISION;
+                s = 0;
+                d = ValueInt.DISPLAY_SIZE;
+            }
+            break;
+        }
         case DATE_TRUNC: {
             Expression p1 = args[1];
             t = p1.getType();

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

@@ -576,7 +576,14 @@ public final class DateTimeFunctions {
         }
     }
 
-    private static int getDatePart(String part) {
+    /**
+     * Get date part function number from part name.
+     *
+     * @param part
+     *            name of the part
+     * @return function number
+     */
+    public static int getDatePart(String part) {
         Integer p = DATE_PART.get(StringUtils.toUpperEnglish(part));
         if (p == null) {
             throw DbException.getInvalidValueException("date part", part);

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -114,6 +114,7 @@ public class TestFunctions extends TestDb implements AggregateFunction {
         testConcatWs();
         testTruncate();
         testDateTrunc();
+        testExtract();
         testToCharFromDateTime();
         testToCharFromNumber();
         testToCharFromText();
@@ -1257,6 +1258,19 @@ public class TestFunctions extends TestDb implements AggregateFunction {
         conn.close();
     }
 
+    private void testExtract() throws SQLException {
+        deleteDb("functions");
+        Connection conn = getConnection("functions");
+        Statement stat = conn.createStatement();
+        stat.execute("CREATE TABLE TEST(TS TIMESTAMP)");
+        stat.execute("INSERT INTO TEST VALUES ('2010-01-01 10:11:12')");
+        assertEquals(Types.INTEGER, stat.executeQuery("SELECT EXTRACT(DAY FROM TS) FROM TEST")
+                .getMetaData().getColumnType(1));
+        assertEquals(Types.DECIMAL, stat.executeQuery("SELECT EXTRACT(EPOCH FROM TS) FROM TEST")
+                .getMetaData().getColumnType(1));
+        conn.close();
+    }
+
     private void testTranslate() throws SQLException {
         Connection conn = getConnection("functions");
         Statement stat = conn.createStatement();