embulk-output-oracle 0.2.4 → 0.3.0

data/src/test/java/org/embulk/output/oracle/TimestampFormatTest.java

@@ -1,57 +1,57 @@
-package org.embulk.output.oracle;
-
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-
-public class TimestampFormatTest {
-
-    @Test
-    public void test() throws ParseException
-    {
-        Date date = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse("2015/03/04 17:08:09");
-        Timestamp t = new Timestamp(date.getTime());
-
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
-            assertEquals("2015-03-04 17:08:09.000000000", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 0);
-            assertEquals("2015-03-04 17:08:09", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 1);
-            assertEquals("2015-03-04 17:08:09.0", format.format(t));
-        }
-
-        t.setNanos(1234567);
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
-            assertEquals("2015-03-04 17:08:09.001234567", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 2);
-            assertEquals("2015-03-04 17:08:09.00", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 3);
-            assertEquals("2015-03-04 17:08:09.001", format.format(t));
-        }
-
-        t.setNanos(123456789);
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
-            assertEquals("2015-03-04 17:08:09.123456789", format.format(t));
-        }
-        {
-            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 1);
-            assertEquals("2015-03-04 17:08:09.1", format.format(t));
-        }
-    }
-
-}
+package org.embulk.output.oracle;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
+public class TimestampFormatTest {
+
+    @Test
+    public void test() throws ParseException
+    {
+        Date date = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse("2015/03/04 17:08:09");
+        Timestamp t = new Timestamp(date.getTime());
+
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
+            assertEquals("2015-03-04 17:08:09.000000000", format.format(t));
+        }
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 0);
+            assertEquals("2015-03-04 17:08:09", format.format(t));
+        }
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 1);
+            assertEquals("2015-03-04 17:08:09.0", format.format(t));
+        }
+
+        t.setNanos(1234567);
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
+            assertEquals("2015-03-04 17:08:09.001234567", format.format(t));
+        }
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 2);
+            assertEquals("2015-03-04 17:08:09.00", format.format(t));
+        }
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 3);
+            assertEquals("2015-03-04 17:08:09.001", format.format(t));
+        }
+
+        t.setNanos(123456789);
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 9);
+            assertEquals("2015-03-04 17:08:09.123456789", format.format(t));
+        }
+        {
+            TimestampFormat format = new TimestampFormat("yyyy-MM-dd HH:mm:ss", 1);
+            assertEquals("2015-03-04 17:08:09.1", format.format(t));
+        }
+    }
+
+}

data/src/test/resources/data/test1/test1.csv

@@ -1,3 +1,3 @@
-A001,ABCDE,0,123.45,2015/03/05,2015/03/05 12:34:56
-A002,あいうえお,-9999,-99999999.99,2015/03/06,2015/03/06 23:59:59
-A003,,,,,
+A001,ABCDE,0,123.45,2015/03/05,2015/03/05 12:34:56
+A002,あいうえお,-9999,-99999999.99,2015/03/06,2015/03/06 23:59:59
+A003,,,,,

data/src/test/resources/yml/test-insert-direct.yml

@@ -1,26 +1,26 @@
-in:
-  type: file
-  path_prefix: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    host: localhost
-    database: TESTDB
-    user: TEST_USER
-    password: test_pw
-    table: TEST1
-    mode: insert
-    insert_method: direct
-    #driver_path: driver/ojdbc7.jar
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert
+    insert_method: direct
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-insert-oci-split.yml

@@ -1,26 +1,26 @@
-in:
-  type: filesplit
-  path: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    host: localhost
-    database: TESTDB
-    user: TEST_USER
-    password: test_pw
-    table: TEST1
-    mode: insert
-    insert_method: oci
-    #driver_path: driver/ojdbc7.jar
+in:
+  type: filesplit
+  path: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert
+    insert_method: oci
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-insert-oci.yml

@@ -1,26 +1,26 @@
-in:
-  type: file
-  path_prefix: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    host: localhost
-    database: TESTDB
-    user: TEST_USER
-    password: test_pw
-    table: TEST1
-    mode: insert
-    insert_method: oci
-    #driver_path: driver/ojdbc7.jar
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert
+    insert_method: oci
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-insert.yml

@@ -1,25 +1,25 @@
-in:
-  type: file
-  path_prefix: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    host: localhost
-    database: TESTDB
-    user: TEST_USER
-    password: test_pw
-    table: TEST1
-    mode: insert
-    #driver_path: driver/ojdbc7.jar
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-replace-long-name-multibyte.yml

@@ -0,0 +1,25 @@
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: ＴＥＳＴ12345678901234567890
+    mode: replace
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-replace-long-name.yml

@@ -1,25 +1,25 @@
-in:
-  type: file
-  path_prefix: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    host: localhost
-    database: TESTDB
-    user: TEST_USER
-    password: test_pw
-    table: TEST12345678901234567890123456
-    mode: replace
-    #driver_path: driver/ojdbc7.jar
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST12345678901234567890123456
+    mode: replace
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-replace.yml

@@ -1,25 +1,25 @@
-in:
-  type: file
-  path_prefix: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    host: localhost
-    database: TESTDB
-    user: TEST_USER
-    password: test_pw
-    table: TEST1
-    mode: replace
-    #driver_path: driver/ojdbc7.jar
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: replace
+    #driver_path: driver/ojdbc7.jar

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

@@ -0,0 +1,25 @@
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: string}
+    - {name: TIMESTAMP_ITEM, type: string}
+out:
+    type: oracle
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert
+    #driver_path: driver/ojdbc7.jar

data/src/test/resources/yml/test-url.yml

@@ -1,24 +1,24 @@
-in:
-  type: file
-  path_prefix: '/data/test1/test1.csv'
-  parser:
-    charset: UTF-8
-    newline: CRLF
-    type: csv
-    delimiter: ','
-    quote: ''
-    columns:
-    - {name: ID, type: string}
-    - {name: VARCHAR2_ITEM, type: string}
-    - {name: INTEGER_ITEM, type: long}
-    - {name: NUMBER_ITEM, type: string}
-    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
-    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
-out:
-    type: oracle
-    user: TEST_USER
-    password: test_pw
-    table: TEST1
-    mode: insert
-    #driver_path: driver/ojdbc7.jar
-    url: jdbc:oracle:thin:@localhost:1521:TESTDB
+in:
+  type: file
+  path_prefix: '/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: VARCHAR2_ITEM, type: string}
+    - {name: INTEGER_ITEM, type: long}
+    - {name: NUMBER_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: TIMESTAMP_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+out:
+    type: oracle
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert
+    #driver_path: driver/ojdbc7.jar
+    url: jdbc:oracle:thin:@localhost:1521:TESTDB

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -44,7 +44,6 @@ files:
 - src/main/java/org/embulk/output/oracle/oci/OCIWrapper.java
 - src/main/java/org/embulk/output/oracle/oci/RowBuffer.java
 - src/main/java/org/embulk/output/oracle/oci/TableDefinition.java
-- src/main/java/org/embulk/output/oracle/setter/OracleColumnSetterFactory.java
 - src/test/cpp/common/embulk-output-oracle-test.cpp
 - src/test/cpp/linux/build.sh
 - src/test/cpp/win/build.bat
@@ -63,11 +62,13 @@ files:
 - src/test/resources/yml/test-insert-oci-split.yml
 - src/test/resources/yml/test-insert-oci.yml
 - src/test/resources/yml/test-insert.yml
+- src/test/resources/yml/test-replace-long-name-multibyte.yml
 - src/test/resources/yml/test-replace-long-name.yml
 - src/test/resources/yml/test-replace.yml
+- src/test/resources/yml/test-string-timestamp.yml
 - src/test/resources/yml/test-url.yml
-- classpath/embulk-output-jdbc-0.2.4.jar
-- classpath/embulk-output-oracle-0.2.4.jar
+- classpath/embulk-output-jdbc-0.3.0.jar
+- classpath/embulk-output-oracle-0.3.0.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0

data/src/main/java/org/embulk/output/oracle/setter/OracleColumnSetterFactory.java

@@ -1,31 +0,0 @@
-package org.embulk.output.oracle.setter;
-
-import java.sql.Types;
-
-import org.embulk.output.jdbc.BatchInsert;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.setter.ColumnSetter;
-import org.embulk.output.jdbc.setter.ColumnSetterFactory;
-import org.embulk.output.jdbc.setter.StringColumnSetter;
-import org.embulk.spi.PageReader;
-import org.embulk.spi.time.TimestampFormatter;
-
-public class OracleColumnSetterFactory extends ColumnSetterFactory
-{
-    public OracleColumnSetterFactory(BatchInsert batch, PageReader pageReader,
-            TimestampFormatter timestampFormatter)
-    {
-        super(batch, pageReader, timestampFormatter);
-    }
-    
-    @Override
-    public ColumnSetter newColumnSetter(JdbcColumn column)
-    {
-        switch (column.getSqlType()) {
-            case Types.DECIMAL:
-                return new StringColumnSetter(batch, pageReader, column, timestampFormatter);
-            default:
-                return super.newColumnSetter(column);
-        }
-    }
-}