embulk-input-mysql 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc441427089a73c25d30442c2683f881bebcb3d6297d3ef062ebb3a069912a49
-  data.tar.gz: c9dba75abd31ef6fff03aa0e7a5fb3938e8df75ef3202ddfedebf106419e4902
+  metadata.gz: 660ed6d7a5a4be33a8c313f62b415b2d04c8af90b10f6ccc9309c768247b720c
+  data.tar.gz: 9ba6cd527699dd7357118764e47000b95638d2cae7fcf822b8e25bfc4b0ffb51
 SHA512:
-  metadata.gz: 7105db953dedce4d4b84bffcdb9219cdc52dd889592a6907a3b3c2b5ca52d821ec29029d2f9765bbce29779f1fd0df193adc2c86029eb08dcde84065db697fe9
-  data.tar.gz: 75a2c458dfb3b43d0d0321b145c5d8db6789d9a3408110d3a807e358f9f15d40e032cb5f9e6e20258f0ac0f8b51be8921739770c098805a2d441e8cb2ca19948
+  metadata.gz: 3ff886c1e4eb01827a23d12b487d4e6b4c1f1f38594e64d9e4c83d080778501210b201fb98265215179a0d66d29b44d0b8e1c9b683d27d2ac38e767fe039c8f2
+  data.tar.gz: 6714232e99e617371e789f3a2171e96017e35ba9d70b4acfdb4aa976d34759cef033bf6f96805541a8acf19c4d816d63749fb119133c073721f4a986e97e9b3c

data/README.md

@@ -41,7 +41,7 @@ MySQL input plugin for Embulk loads records from MySQL.
 - **socket_timeout**: timeout on network socket operations. 0 means no timeout. (integer (seconds), default: 1800)
 - **options**: extra JDBC properties (hash, default: {})
 - **incremental**: if true, enables incremental loading. See next section for details (boolean, default: false)
-- **incremental_columns**: column names for incremental loading (array of strings, default: use primary keys)
+- **incremental_columns**: column names for incremental loading (array of strings, default: use primary keys). Columns of integer types, string types, `datetime` and `timestamp` are supported.
 - **last_record**: values of the last record for incremental loading (array of objects, default: load all records)
 - **default_timezone**: If the sql type of a column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted int this default_timezone. You can overwrite timezone for each columns using column_options option. (string, default: `UTC`)
 - **use_legacy_datetime_code**: recommended not to set the property (boolean, default: false). If true, embulk-output-mysql will get wrong datetime values when the server timezone and the client server timezone are different as older embulk-output-mysql did.
@@ -75,13 +75,13 @@ ORDER BY updated_at, id
 
 When bulk data loading finishes successfully, it outputs `last_record: ` paramater as config-diff so that next execution uses it.
 
-At the next execution, when `last_record: ` is also set, this plugin generates additional WHERE conditions to load records larger than the last record. For example, if `last_record: ["2017-01-01 00:32:12", 5291]` is set,
+At the next execution, when `last_record: ` is also set, this plugin generates additional WHERE conditions to load records larger than the last record. For example, if `last_record: ["2017-01-01T00:32:12.487659", 5291]` is set,
 
 ```
 SELECT * FROM (
   ...original query is here...
 )
-WHERE updated_at > '2017-01-01 00:32:12' OR (updated_at = '2017-01-01 00:32:12' AND id > 5291)
+WHERE updated_at > '2017-01-01 00:32:12.487659' OR (updated_at = '2017-01-01 00:32:12.487659' AND id > 5291)
 ORDER BY updated_at, id
 ```
 

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

@@ -65,6 +65,26 @@ public class IncrementalTest
         assertThat(result2.getConfigDiff(), is((ConfigDiff) loadYamlResource(embulk, "int/expected_2.diff")));
     }
 
+    @Test
+    public void testChar() throws Exception
+    {
+        // setup first rows
+        execute(readResource("char/setup.sql"));
+
+        Path out1 = embulk.createTempFile("csv");
+        RunResult result1 = embulk.runInput(baseConfig.merge(loadYamlResource(embulk, "char/config_1.yml")), out1);
+        assertThat(readSortedFile(out1), is(readResource("char/expected_1.csv")));
+        assertThat(result1.getConfigDiff(), is((ConfigDiff) loadYamlResource(embulk, "char/expected_1.diff")));
+
+        // insert more rows
+        execute(readResource("char/insert_more.sql"));
+
+        Path out2 = embulk.createTempFile("csv");
+        RunResult result2 = embulk.runInput(baseConfig.merge(loadYamlResource(embulk, "char/config_2.yml")), out2);
+        assertThat(readSortedFile(out2), is(readResource("char/expected_2.csv")));
+        assertThat(result2.getConfigDiff(), is((ConfigDiff) loadYamlResource(embulk, "char/expected_2.diff")));
+    }
+
     @Test
     public void testDateTime() throws Exception
     {

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/config_1.yml

@@ -0,0 +1,3 @@
+table: char_load
+incremental: true
+incremental_columns: [name]

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/config_2.yml

@@ -0,0 +1,4 @@
+table: char_load
+last_record: ['A4']
+incremental: true
+incremental_columns: [name]

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_1.csv

@@ -0,0 +1,4 @@
+A1,first
+A2,first
+A3,first
+A4,first

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_1.diff

@@ -0,0 +1,3 @@
+in:
+  last_record: ['A4']
+out: {}

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_2.csv

@@ -0,0 +1,2 @@
+A5,more_load
+A9,more_load

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_2.diff

@@ -0,0 +1,3 @@
+in:
+  last_record: ['A9']
+out: {}

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/insert_more.sql

@@ -0,0 +1,7 @@
+
+insert into char_load (name, note) values
+('A0', 'more_skip'),
+('A4', 'more_skip'),
+('A9', 'more_load'),
+('A5', 'more_load');
+

data/src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/setup.sql

@@ -0,0 +1,13 @@
+drop table if exists char_load;
+
+create table char_load (
+    name char(2) not null,
+    note text
+);
+
+insert into char_load (name, note) values
+('A3', 'first'),
+('A4', 'first'),
+('A2', 'first'),
+('A1', 'first');
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mysql
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.10.0.jar
-- classpath/embulk-input-mysql-0.10.0.jar
+- classpath/embulk-input-jdbc-0.10.1.jar
+- classpath/embulk-input-mysql-0.10.1.jar
 - default_jdbc_driver/mysql-connector-java-5.1.44.jar
 - lib/embulk/input/mysql.rb
 - src/main/java/org/embulk/input/MySQLInputPlugin.java
@@ -68,6 +68,14 @@ files:
 - src/test/resources/org/embulk/input/mysql/test/expect/basic/test_valuetype_string_config.yml
 - src/test/resources/org/embulk/input/mysql/test/expect/basic/test_valuetype_string_expected.csv
 - src/test/resources/org/embulk/input/mysql/test/expect/basic/test_valuetype_string_expected.diff
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/config_1.yml
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/config_2.yml
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_1.csv
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_1.diff
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_2.csv
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/expected_2.diff
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/insert_more.sql
+- src/test/resources/org/embulk/input/mysql/test/expect/incremental/char/setup.sql
 - src/test/resources/org/embulk/input/mysql/test/expect/incremental/dt/config_1.yml
 - src/test/resources/org/embulk/input/mysql/test/expect/incremental/dt/config_2.yml
 - src/test/resources/org/embulk/input/mysql/test/expect/incremental/dt/expected_1.csv