Merge pull request #6 from ergon/bugfix/interval

Add support for postgres interval date type

Author: jmatj

core/src/main/java/ch/ergon/adam/core/db/schema/DataType.java

@@ -28,6 +28,7 @@ public enum DataType {
     DATE,
     TIMESTAMP,
     TIME,
+    INTERVALYEARTOSECOND,
     INTERVALYEARTOMONTH,
     INTERVALDAYTOSECOND,
     LOCALDATE,

integration-test/src/test/java/ch/ergon/adam/integrationtest/postgresql/PostgreSqlIntervalFieldTest.java

@@ -0,0 +1,41 @@
+package ch.ergon.adam.integrationtest.postgresql;
+
+import ch.ergon.adam.integrationtest.AbstractDbTestBase;
+import ch.ergon.adam.integrationtest.DummySink;
+import ch.ergon.adam.core.db.schema.Schema;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class PostgreSqlIntervalFieldTest extends AbstractDbTestBase {
+
+    public PostgreSqlIntervalFieldTest() {
+        super(new PostgreSqlTestDbUrlProvider());
+    }
+
+    private static final String YML = "---\n" +
+        "name: \"test_table\"\n" +
+        "fields:\n" +
+        "- name: \"duration\"\n" +
+        "  dataType: \"INTERVALYEARTOSECOND\"\n" +
+        "--- []\n" +
+        "--- []\n";
+
+    private static final String CREATE_TABLE_SQL =
+        "create table test_table (" +
+            "duration interval not null" +
+            ")";
+
+    @Test
+    public void testCreateTableToYml() throws Exception {
+        getSourceDbConnection().createStatement().execute(CREATE_TABLE_SQL);
+        sourceToTarget();
+        DummySink dummySink = targetToDummy();
+        Schema schema = dummySink.getTargetSchema();
+        migrateTargetWithSchema(schema);
+        String yml = targetToYml();
+        assertThat(yml, is(YML));
+    }
+
+}

jooq/src/main/java/ch/ergon/adam/jooq/JooqSink.java

@@ -410,6 +410,9 @@ protected DataType<?> mapRawType(ch.ergon.adam.core.db.schema.DataType type) {
             case TIME:
                 jooqType = SQLDataType.TIME;
                 break;
+            case INTERVALYEARTOSECOND:
+                jooqType = SQLDataType.INTERVAL;
+                break;
             case INTERVALYEARTOMONTH:
                 jooqType = SQLDataType.INTERVALYEARTOMONTH;
                 break;

jooq/src/main/java/ch/ergon/adam/jooq/JooqSource.java

@@ -9,6 +9,9 @@
 import ch.ergon.adam.core.db.schema.Table;
 import org.jooq.*;
 import org.jooq.impl.DSL;
+import org.jooq.types.DayToSecond;
+import org.jooq.types.YearToMonth;
+import org.jooq.types.YearToSecond;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -193,7 +196,20 @@ protected boolean isSequence(org.jooq.Field<?> jooqField) {
     }
 
     protected DataType mapDataTypeFromJooq(org.jooq.Field<?> jooqField) {
-        String typeName = jooqField.getDataType().getSQLDataType().getTypeName();
+        org.jooq.DataType<?> sqlDataType = jooqField.getDataType().getSQLDataType();
+        if (sqlDataType.isInterval()) {
+            Class<?> type = sqlDataType.getType();
+            if (type.equals(YearToSecond.class)) {
+                return DataType.INTERVALYEARTOSECOND;
+            } else if (type.equals(YearToMonth.class)) {
+                return DataType.INTERVALYEARTOMONTH;
+            } else if (type.equals(DayToSecond.class)) {
+                return DataType.INTERVALDAYTOSECOND;
+            } else {
+                throw new RuntimeException("Unsupported interval type [" + type.getName() + "]");
+            }
+        }
+        String typeName = sqlDataType.getTypeName();
         try {
             return DataType.valueOf(typeName.toUpperCase().replace(" ", ""));
         } catch (IllegalArgumentException e) {