embulk-input-oracle 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a630b0262f22d7facc47e39c38218ae2c6317c48e83bc8701b52380fb99c8ce
-  data.tar.gz: ee05d5351375af8dbd76313647ad3d47334cc1ae2574e2dfab5925274f45a151
+  metadata.gz: 7fd45290a62e5fab8144f58f1c66761f3b9fac00ebbaa9b1f68d34d7a2a630fc
+  data.tar.gz: fb2620bbb65061a8ebe163ec28d3c668f1a2fe36196eb2f1640576ca88c83610
 SHA512:
-  metadata.gz: 94f2855054a9b4564fa1cf7da9b47b072ca623848ba598e4095200b786b75beb282083f2448526d139937f94ed7a41b326c87bf2ad235543910c8db0b1077f02
-  data.tar.gz: 9b23bf271dcbfc892b9d81bc6c64d45890717ecb95174fa20c1888daf2f598173a3fde391840a261487d97a92b415fb532709bbfc63ca0dc2a830c3cca8f298b
+  metadata.gz: e4d46471e9fb17fc8e755d675e9cb91473f18cdff52c37e9a1c61303acfbb5340cbd67f488ccd76067a14b38b6f35db85144ceea3396e5a4617861e59da1c99b
+  data.tar.gz: 07e0b3c0941d1990ce3aa5d45eaf21bf33c17473687f17b2d73358c6ccbda69b3b3c51e7543c43cd3acb34154baad3e7da9bd2fed3de08c856e4ec5e5cd30604

data/README.md

@@ -32,7 +32,8 @@ Oracle input plugin for Embulk loads records from Oracle.
 - **socket_timeout**: timeout for socket read operations. (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, `date` and `timestamp` are supported.
+NOTE: Because Oracle `NUMBER` type is mapped to embulk `double` type by default, you should explicitly map it to embulk `long` type by `column_options` in order to use it as incremental column.
 - **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`)
 - **default_column_options**: advanced: column_options for each JDBC type as default. key-value pairs where key is a JDBC type (e.g. 'DATE', 'BIGINT') and value is same as column_options's value.
@@ -65,13 +66,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/oracle/IncrementalTest.java

@@ -77,6 +77,38 @@ public class IncrementalTest
                 is((ConfigDiff) loadYamlResource(embulk, "int/expected_2.diff")));
     }
 
+    @Test
+    public void simpleChar() throws Exception
+    {
+        // setup first rows
+        execute(embulk, 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(embulk, 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 simpleDate() throws Exception
     {

data/src/test/resources/org/embulk/input/oracle/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/oracle/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/oracle/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/oracle/test/expect/incremental/char/expected_1.diff

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

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

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

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

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

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

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

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

@@ -0,0 +1,13 @@
+drop table char_load;
+
+create table char_load (
+    name CHAR(2) not null,
+    note VARCHAR2(10)
+);
+
+insert into char_load (name, note) values ('A3', 'first');
+insert into char_load (name, note) values ('A4', 'first');
+insert into char_load (name, note) values ('A2', 'first');
+insert into char_load (name, note) values ('A1', 'first');
+
+EXIT;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-oracle
 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-oracle-0.10.0.jar
+- classpath/embulk-input-jdbc-0.10.1.jar
+- classpath/embulk-input-oracle-0.10.1.jar
 - lib/embulk/input/oracle.rb
 - src/main/java/org/embulk/input/OracleInputPlugin.java
 - src/main/java/org/embulk/input/oracle/OracleInputConnection.java
@@ -48,6 +48,14 @@ files:
 - src/test/resources/org/embulk/input/oracle/test/expect/basic/test_unknown_type_expected2.diff
 - src/test/resources/org/embulk/input/oracle/test/expect/basic/test_unknown_type_expected3.csv
 - src/test/resources/org/embulk/input/oracle/test/expect/basic/test_unknown_type_expected3.diff
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/config_1.yml
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/config_2.yml
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/expected_1.csv
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/expected_1.diff
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/expected_2.csv
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/expected_2.diff
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/insert_more.sql
+- src/test/resources/org/embulk/input/oracle/test/expect/incremental/char/setup.sql
 - src/test/resources/org/embulk/input/oracle/test/expect/incremental/date/config_1.yml
 - src/test/resources/org/embulk/input/oracle/test/expect/incremental/date/config_2.yml
 - src/test/resources/org/embulk/input/oracle/test/expect/incremental/date/expected_1.csv