Merge pull request #13 from embulk/fix-merge-time-format

Fix merging time formats by upgrading embulk-util-guess to 0.1.4

Author: dmikurube

embulk-guess-csv/build.gradle

@@ -21,7 +21,7 @@ dependencies {
 
     compile project(":embulk-parser-csv")
     compile "com.ibm.icu:icu4j:54.1.1"
-    compile "org.embulk:embulk-util-guess:0.1.3"
+    compile "org.embulk:embulk-util-guess:0.1.4"
 
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.embulk:embulk-api:0.10.33"

embulk-guess-csv/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -9,7 +9,7 @@ com.ibm.icu:icu4j:54.1.1
 javax.validation:validation-api:1.1.0.Final
 org.embulk:embulk-util-config:0.3.1
 org.embulk:embulk-util-file:0.1.3
-org.embulk:embulk-util-guess:0.1.3
+org.embulk:embulk-util-guess:0.1.4
 org.embulk:embulk-util-json:0.1.1
 org.embulk:embulk-util-rubytime:0.3.2
 org.embulk:embulk-util-text:0.1.1

embulk-guess-csv/src/test/java/org/embulk/standards/guess/TestCsvGuessPlugin.java

@@ -81,6 +81,13 @@ public void testComplex() throws Exception {
                 "test_complex_guessed.yml");
     }
 
+    @Test
+    public void testMergeTimeFormats() throws Exception {
+        assertGuessByResource(embulk,
+                "test_merge_time_formats_seed.yml", "test_merge_time_formats.csv",
+                "test_merge_time_formats_guessed.yml");
+    }
+
     @Test
     public void testFor1Rows() throws Exception {
         assertGuessByResource(embulk,

embulk-guess-csv/src/test/resources/org/embulk/standards/guess/csv/test/test_merge_time_formats.csv

@@ -0,0 +1,5 @@
+time,name
+2021-12-1 24:30:30,"foo bar"
+2021-12-1  4:30:30,foo
+2021-12-1 24:30:30,bar
+2021-12-1 24:30:30,baz

embulk-guess-csv/src/test/resources/org/embulk/standards/guess/csv/test/test_merge_time_formats_guessed.yml

@@ -0,0 +1,13 @@
+charset: UTF-8
+newline: LF
+quote: '"'
+type: csv
+delimiter: ','
+escape: '"'
+trim_if_not_quoted: false
+skip_header_lines: 1
+allow_extra_columns: false
+allow_optional_columns: false
+columns:
+- {"name": "time", "type": "timestamp", "format": "%Y-%m-%d %k:%M:%S"}
+- {"name": "name", "type": "string"}

embulk-guess-csv/src/test/resources/org/embulk/standards/guess/csv/test/test_merge_time_formats_seed.yml

@@ -0,0 +1 @@
+{}

embulk-guess-csv_all_strings/gradle/dependency-locks/embulkPluginRuntime.lockfile

@@ -9,7 +9,7 @@ com.ibm.icu:icu4j:54.1.1
 javax.validation:validation-api:1.1.0.Final
 org.embulk:embulk-util-config:0.3.1
 org.embulk:embulk-util-file:0.1.3
-org.embulk:embulk-util-guess:0.1.3
+org.embulk:embulk-util-guess:0.1.4
 org.embulk:embulk-util-json:0.1.1
 org.embulk:embulk-util-rubytime:0.3.2
 org.embulk:embulk-util-text:0.1.1