Support Interval class in more places

h2/src/main/org/h2/jdbc/JdbcResultSet.java

@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import org.h2.api.ErrorCode;
+import org.h2.api.Interval;
 import org.h2.api.TimestampWithTimeZone;
 import org.h2.command.CommandInterface;
 import org.h2.engine.Mode;
@@ -53,6 +54,7 @@ import org.h2.value.ValueDecimal;
 import org.h2.value.ValueDouble;
 import org.h2.value.ValueFloat;
 import org.h2.value.ValueInt;
+import org.h2.value.ValueInterval;
 import org.h2.value.ValueLong;
 import org.h2.value.ValueNull;
 import org.h2.value.ValueShort;
@@ -3929,6 +3931,12 @@ public class JdbcResultSet extends TraceObject implements ResultSet, JdbcResultS
         } else if (type == TimestampWithTimeZone.class) {
             ValueTimestampTimeZone v = (ValueTimestampTimeZone) value.convertTo(Value.TIMESTAMP_TZ);
             return type.cast(new TimestampWithTimeZone(v.getDateValue(), v.getTimeNanos(), v.getTimeZoneOffsetMins()));
+        } else if (type == Interval.class) {
+            if (!(value instanceof ValueInterval)) {
+                value = value.convertTo(Value.INTERVAL_DAY_TO_SECOND);
+            }
+            ValueInterval v = (ValueInterval) value;
+            return type.cast(new Interval(v.getQualifier(), v.getLeading(), v.getRemaining()));
         } else if (DataType.isGeometryClass(type)) {
             return type.cast(value.convertTo(Value.GEOMETRY).getObject());
         } else if (type == LocalDateTimeUtils.LOCAL_DATE) {

h2/src/main/org/h2/value/DataType.java

@@ -896,6 +896,21 @@ public class DataType {
             return ResultSet.class.getName();
         case Value.GEOMETRY:
             return GEOMETRY_CLASS_NAME;
+        case Value.INTERVAL_YEAR:
+        case Value.INTERVAL_MONTH:
+        case Value.INTERVAL_DAY:
+        case Value.INTERVAL_HOUR:
+        case Value.INTERVAL_MINUTE:
+        case Value.INTERVAL_SECOND:
+        case Value.INTERVAL_YEAR_TO_MONTH:
+        case Value.INTERVAL_DAY_TO_HOUR:
+        case Value.INTERVAL_DAY_TO_MINUTE:
+        case Value.INTERVAL_DAY_TO_SECOND:
+        case Value.INTERVAL_HOUR_TO_MINUTE:
+        case Value.INTERVAL_HOUR_TO_SECOND:
+        case Value.INTERVAL_MINUTE_TO_SECOND:
+            // "org.h2.api.Interval"
+            return Interval.class.getName();
         default:
             if (JdbcUtils.customDataTypesHandler != null) {
                 return JdbcUtils.customDataTypesHandler.getDataTypeClassName(type);
@@ -1257,6 +1272,9 @@ public class DataType {
             return LocalDateTimeUtils.offsetDateTimeToValue(x);
         } else if (x instanceof TimestampWithTimeZone) {
             return ValueTimestampTimeZone.get((TimestampWithTimeZone) x);
+        } else if (x instanceof Interval) {
+            Interval i = (Interval) x;
+            return ValueInterval.from(i.getQualifier(), i.getLeading(), i.getRemaining());
         } else {
             if (JdbcUtils.customDataTypesHandler != null) {
                 return JdbcUtils.customDataTypesHandler.getValue(type, x,

h2/src/test/org/h2/test/jdbc/TestPreparedStatement.java

@@ -30,6 +30,8 @@ import java.util.GregorianCalendar;
 import java.util.UUID;
 
 import org.h2.api.ErrorCode;
+import org.h2.api.Interval;
+import org.h2.api.IntervalQualifier;
 import org.h2.api.Trigger;
 import org.h2.engine.SysProperties;
 import org.h2.message.DbException;
@@ -180,6 +182,7 @@ public class TestPreparedStatement extends TestDb {
         testDateTime8(conn);
         testOffsetDateTime8(conn);
         testInstant8(conn);
+        testInterval(conn);
         testArray(conn);
         testSetObject(conn);
         testPreparedSubquery(conn);
@@ -902,6 +905,17 @@ public class TestPreparedStatement extends TestDb {
         rs.close();
     }
 
+    private void testInterval(Connection conn) throws SQLException {
+        PreparedStatement prep = conn.prepareStatement("SELECT ?");
+        Interval interval = new Interval(IntervalQualifier.MINUTE, 100, 0);
+        prep.setObject(1, interval);
+        ResultSet rs = prep.executeQuery();
+        rs.next();
+        assertEquals("INTERVAL '100' MINUTE", rs.getString(1));
+        assertEquals(interval, rs.getObject(1));
+        assertEquals(interval, rs.getObject(1, Interval.class));
+    }
+
     private void testPreparedSubquery(Connection conn) throws SQLException {
         Statement s = conn.createStatement();
         s.executeUpdate("CREATE TABLE TEST(ID IDENTITY, FLAG BIT)");

h2/src/test/org/h2/test/jdbc/TestResultSet.java

@@ -37,6 +37,8 @@ import java.util.Collections;
 import java.util.TimeZone;
 
 import org.h2.api.ErrorCode;
+import org.h2.api.Interval;
+import org.h2.api.IntervalQualifier;
 import org.h2.engine.SysProperties;
 import org.h2.test.TestBase;
 import org.h2.test.TestDb;
@@ -103,6 +105,7 @@ public class TestResultSet extends TestDb {
         testDoubleFloat();
         testDatetime();
         testDatetimeWithCalendar();
+        testInterval();
         testBlob();
         testClob();
         testAutoIncrement();
@@ -1562,6 +1565,22 @@ public class TestResultSet extends TestDb {
         stat.execute("DROP TABLE TEST");
     }
 
+    private void testInterval() throws SQLException {
+        trace("Test INTERVAL");
+        ResultSet rs;
+
+        rs = stat.executeQuery("CALL INTERVAL '10' YEAR");
+        rs.next();
+        assertEquals("INTERVAL '10' YEAR", rs.getString(1));
+        Interval expected = new Interval(IntervalQualifier.YEAR, 10, 0);
+        assertEquals(expected, rs.getObject(1));
+        assertEquals(expected, rs.getObject(1, Interval.class));
+        ResultSetMetaData metaData = rs.getMetaData();
+        assertEquals(Types.OTHER, metaData.getColumnType(1));
+        assertEquals("INTERVAL YEAR", metaData.getColumnTypeName(1));
+        assertEquals(Interval.class.getName(), metaData.getColumnClassName(1));
+    }
+
     private void testBlob() throws SQLException {
         trace("Test BLOB");
         ResultSet rs;