embulk-input-mysql 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f02975b24e6df7e4e3fe9eee4366448d02d17ef
-  data.tar.gz: a3134e8c89d0eb787d397ce2cb26ebd3a07e1b95
+  metadata.gz: dd90341b77cceca9532bf385439c2437f8caf517
+  data.tar.gz: dd81a39ddc867c7e0c577096792d2178b237dfb9
 SHA512:
-  metadata.gz: c4ee7883fa9a550063c961de66927cf4687169fc16a544167822e29bfc3f9a191aff0f071dd9a4229a55a99801cc5d5e98d2b1a06c6b8f3e1c404ac4bfcfc144
-  data.tar.gz: 3f15c1095f95c81882606f4315d1ae0d3ae0f8dad518745765fdfdd5856de175a013c0a0b666ef5b665bfa75210dd72b11d40d40366af9e6c2aed6d459ea5f97
+  metadata.gz: ddd6c09b93413f5bcc36120ba1841193c4f3e662f9f2e8d1652f75c3ebc609113c7c6a144386ccb3ef8956c5eb383d9addfe7f3380f60eabf04b9ae40b6db47a
+  data.tar.gz: b7669585a6c96283717542589ed978b53b17c905c7d11cb41d63453e07cfe7783de1a8e73731226c830582d48d39d2393fea1d62e46e1c5f09b2cae8d4bfc2c0

data/README.md

@@ -38,7 +38,7 @@ MySQL input plugins for Embulk loads records from MySQL.
   - **type**: Column values are converted to this embulk type.
   Available values options are: `boolean`, `long`, `double`, `string`, `timestamp`).
   By default, the embulk type is determined according to the sql type of the column (or value_type if specified).
-  - **timestamp_format**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted by this timestamp_format. And if the embulk type is `timestamp`, this timestamp_format will be used in the output plugin. (string, default : `%Y-%m-%d` for `date`, `%H:%M:%S` for `time`, `%Y-%m-%d %H:%M:%S` for `timestamp`)
+  - **timestamp_format**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted by this timestamp_format. And if the embulk type is `timestamp`, this timestamp_format may be used in the output plugin. For example, stdout plugin use the timestamp_format, but *csv formatter plugin doesn't use*. (string, default : `%Y-%m-%d` for `date`, `%H:%M:%S` for `time`, `%Y-%m-%d %H:%M:%S` for `timestamp`)
   - **timezone**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted in this timezone.
 (string, value of default_timezone option is used by default)
 

data/build.gradle

@@ -3,6 +3,6 @@ dependencies {
 
     compile 'mysql:mysql-connector-java:5.1.34'
 
-    testCompile 'org.embulk:embulk-standards:0.6.11'
+    testCompile 'org.embulk:embulk-standards:0.6.16'
     testCompile project(':embulk-input-jdbc').sourceSets.test.output
 }

data/src/test/java/org/embulk/input/mysql/EmbulkPluginTester.java

@@ -74,8 +74,12 @@ public class EmbulkPluginTester
         Injector injector = service.getInjector();
         ConfigSource config = injector.getInstance(ConfigLoader.class).fromYamlFile(new File(ymlPath));
         ExecSession session = new ExecSession(injector, config);
-        BulkLoader loader = injector.getInstance(BulkLoader.class);
-        ExecutionResult result = loader.run(session, config);
+        try {
+            BulkLoader loader = injector.getInstance(BulkLoader.class);
+            ExecutionResult result = loader.run(session, config);
+        } finally {
+            session.cleanup();
+        }
     }
 
 }

data/src/test/java/org/embulk/input/mysql/EmptyConfigSource.java

@@ -97,4 +97,9 @@ public class EmptyConfigSource implements ConfigSource
         return null;
     }
 
+    @Override
+    public ConfigSource remove(String arg0) {
+        return null;
+    }
+
 }

data/src/test/java/org/embulk/input/mysql/MySQLInputPluginTest.java

@@ -125,7 +125,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015-06-04 14:45:06,,",
                     "99,9999,-99999999,-9999999999999999,1.2345000505447388,1.234567890123,-1234.0,1.2345678901234568E17,5678,xy,2015-06-03,2015-06-04 03:34:56,2015-06-04 14:45:06,23:04:02,2015-06-03 16:02:03"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -139,7 +139,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015-06-04 14:45:06,,",
                     "99,9999,-99999999,-9999999999999999,1.2345,1.234567890123,-1234,123456789012345678.12,5678,xy,2015-06-03,2015-06-04 03:34:56,2015-06-04 14:45:06,23:04:02,2015-06-03 16:02:03"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -153,7 +153,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015-06-04 14:45:06,,",
                     "true,true,false,false,true,true,false,true,,,2015-06-03,2015-06-04 03:34:56,2015-06-04 14:45:06,23:04:02,2015-06-03 16:02:03"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -167,7 +167,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015-06-04 14:45:06,,",
                     "99,9999,-99999999,-9999999999999999,1,1,-1234,123456789012345678,5678,,2015-06-03,2015-06-04 03:34:56,2015-06-04 14:45:06,23:04:02,2015-06-03 16:02:03"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -181,7 +181,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015-06-04 14:45:06,,",
                     "99.0,9999.0,-9.9999999E7,-1.0E16,1.2345000505447388,1.234567890123,-1234.0,1.2345678901234568E17,5678.0,,2015-06-03,2015-06-04 03:34:56,2015-06-04 14:45:06,23:04:02,2015-06-03 16:02:03"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -195,7 +195,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015/06/04 14:45:06,,",
                     "99,9999,-99999999,-9999999999999999,1.2345000505447388,1.234567890123,-1234.0,1.2345678901234568E17,5678,xy,2015/06/03,2015/06/04 03:34:56,2015/06/04 14:45:06,23-04-02,2015/06/03 16:02:03.123456"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -209,7 +209,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015/06/04 23:45:06,,",
                     "99,9999,-99999999,-9999999999999999,1.2345000505447388,1.234567890123,-1234.0,1.2345678901234568E17,5678,xy,2015/06/03,2015/06/04 03:34:56,2015/06/04 23:45:06,08-04-02,2015/06/03 16:02:03.123456"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -223,7 +223,7 @@ public class MySQLInputPluginTest
                     "c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15",
                     ",,,,,,,,,,,,2015/06/04 23:45:06,,",
                     "99,9999,-99999999,-9999999999999999,1.2345000505447388,1.234567890123,-1234.0,1.2345678901234568E17,5678,xy,2015/06/04,2015/06/04 12:34:56,2015/06/04 23:45:06,02-04-02,2015/06/04 01:02:03.123456"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -236,7 +236,7 @@ public class MySQLInputPluginTest
             assertEquals(Arrays.asList(
                     "c1",
                     "18446744073709551615"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 
@@ -249,7 +249,7 @@ public class MySQLInputPluginTest
             assertEquals(Arrays.asList(
                     "c1",
                     "1.8446744073709552E19"),
-                    read("mysql-input.000.00.csv"));
+                    read("mysql-input000.00.csv"));
         }
     }
 

data/src/test/resources/yml/input-boolean.yml

@@ -21,6 +21,12 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv
+    column_options:
+      c11: {format: '%Y-%m-%d'}
+      c12: {format: '%Y-%m-%d %H:%M:%S'}
+      c13: {format: '%Y-%m-%d %H:%M:%S'}
+      c14: {format: '%H:%M:%S'}
+      c15: {format: '%Y-%m-%d %H:%M:%S'}

data/src/test/resources/yml/input-double.yml

@@ -21,6 +21,12 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv
+    column_options:
+      c11: {format: '%Y-%m-%d'}
+      c12: {format: '%Y-%m-%d %H:%M:%S'}
+      c13: {format: '%Y-%m-%d %H:%M:%S'}
+      c14: {format: '%H:%M:%S'}
+      c15: {format: '%Y-%m-%d %H:%M:%S'}

data/src/test/resources/yml/input-long.yml

@@ -21,6 +21,12 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv
+    column_options:
+      c11: {format: '%Y-%m-%d'}
+      c12: {format: '%Y-%m-%d %H:%M:%S'}
+      c13: {format: '%Y-%m-%d %H:%M:%S'}
+      c14: {format: '%H:%M:%S'}
+      c15: {format: '%Y-%m-%d %H:%M:%S'}

data/src/test/resources/yml/input-string.yml

@@ -21,6 +21,12 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv
+    column_options:
+      c11: {format: '%Y-%m-%d'}
+      c12: {format: '%Y-%m-%d %H:%M:%S'}
+      c13: {format: '%Y-%m-%d %H:%M:%S'}
+      c14: {format: '%H:%M:%S'}
+      c15: {format: '%Y-%m-%d %H:%M:%S'}

data/src/test/resources/yml/input-timestamp1.yml

@@ -7,15 +7,26 @@ in:
   table: test1
   select: "*"
   column_options:
-    c11: {type: timestamp, timestamp_format: '%Y/%m/%d'}
-    c12: {type: timestamp, timestamp_format: '%Y/%m/%d %H:%M:%S'}
-    c13: {type: timestamp, timestamp_format: '%Y/%m/%d %H:%M:%S', timezone: '+0900'}
-    c14: {type: timestamp, timestamp_format: '%H-%M-%S', timezone: '+0900'}
-    c15: {type: timestamp, timestamp_format: '%Y/%m/%d %H:%M:%S.%6N'}
+    #c11: {type: timestamp, timestamp_format: '%Y/%m/%d'}
+    #c12: {type: timestamp, timestamp_format: '%Y/%m/%d %H:%M:%S'}
+    #c13: {type: timestamp, timestamp_format: '%Y/%m/%d %H:%M:%S', timezone: '+0900'}
+    #c14: {type: timestamp, timestamp_format: '%H-%M-%S', timezone: '+0900'}
+    #c15: {type: timestamp, timestamp_format: '%Y/%m/%d %H:%M:%S.%6N'}
+    c11: {type: timestamp}
+    c12: {type: timestamp}
+    c13: {type: timestamp}
+    c14: {type: timestamp}
+    c15: {type: timestamp}
 
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv
+    column_options:
+      c11: {format: '%Y/%m/%d'}
+      c12: {format: '%Y/%m/%d %H:%M:%S'}
+      c13: {format: '%Y/%m/%d %H:%M:%S'}
+      c14: {format: '%H-%M-%S'}
+      c15: {format: '%Y/%m/%d %H:%M:%S.%6N'}

data/src/test/resources/yml/input-timestamp2.yml

@@ -16,6 +16,6 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv

data/src/test/resources/yml/input-timestamp3.yml

@@ -17,6 +17,6 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv

data/src/test/resources/yml/input-valuetype-decimal.yml

@@ -12,6 +12,6 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv

data/src/test/resources/yml/input-valuetype-string.yml

@@ -12,6 +12,6 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv

data/src/test/resources/yml/input.yml

@@ -10,6 +10,12 @@ in:
 out:
   type: file
   path_prefix: mysql-input
-  file_ext: .csv
+  file_ext: csv
   formatter:
     type: csv
+    column_options:
+      c11: {format: '%Y-%m-%d'}
+      c12: {format: '%Y-%m-%d %H:%M:%S'}
+      c13: {format: '%Y-%m-%d %H:%M:%S'}
+      c14: {format: '%H:%M:%S'}
+      c15: {format: '%Y-%m-%d %H:%M:%S'}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mysql
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -36,8 +36,8 @@ files:
 - src/test/resources/yml/input-valuetype-decimal.yml
 - src/test/resources/yml/input-valuetype-string.yml
 - src/test/resources/yml/input.yml
-- classpath/embulk-input-jdbc-0.5.0.jar
-- classpath/embulk-input-mysql-0.5.0.jar
+- classpath/embulk-input-jdbc-0.6.0.jar
+- classpath/embulk-input-mysql-0.6.0.jar
 - classpath/mysql-connector-java-5.1.34.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses: