embulk-output-sqlserver 0.5.0 → 0.5.1

data/src/test/java/org/embulk/output/sqlserver/SQLServerOutputPluginTest.java

@@ -204,6 +204,170 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         assertTable(1, table, true);
     }
 
+    @Test
+    public void testNativeString() throws Exception
+    {
+        if (!canTest) {
+            return;
+        }
+
+        String table = "TEST2";
+
+        dropTable(table);
+        executeSQL(String.format("CREATE TABLE %S (ITEM1 CHAR(4), ITEM2 VARCHAR(8), ITEM3 TEXT, ITEM4 NCHAR(4), ITEM5 NVARCHAR(8), ITEM6 NTEXT)", table));
+
+        tester.run(convertYml("/sqlserver/yml/test-native-string.yml"));
+
+        List<List<Object>> rows = select(table);
+        assertEquals(2, rows.size());
+        {
+            List<Object> row = rows.get(0);
+            assertEquals("A001", row.get(0));
+            assertEquals("TEST", row.get(1));
+            assertEquals("Ａ", row.get(2));
+            assertEquals("あいうえ", row.get(3));
+            assertEquals("あいうえおかきく", row.get(4));
+            assertEquals("あいうえお", row.get(5));
+        }
+        {
+            List<Object> row = rows.get(1);
+            assertEquals("A002", row.get(0));
+            assertEquals(null, row.get(1));
+            assertEquals(null, row.get(2));
+            assertEquals(null, row.get(3));
+            assertEquals(null, row.get(4));
+            assertEquals(null, row.get(5));
+        }
+    }
+
+    @Test
+    public void testNativeInteger() throws Exception
+    {
+        if (!canTest) {
+            return;
+        }
+
+        String table = "TEST3";
+
+        dropTable(table);
+        executeSQL(String.format("CREATE TABLE %S (ITEM1 TINYINT, ITEM2 SMALLINT, ITEM3 INT, ITEM4 BIGINT, ITEM5 BIT)", table));
+
+        tester.run(convertYml("/sqlserver/yml/test-native-integer.yml"));
+
+        List<List<Object>> rows = select(table);
+        assertEquals(2, rows.size());
+        {
+            List<Object> row = rows.get(0);
+            assertEquals((short)1, row.get(0));
+            assertEquals((short)1111, row.get(1));
+            assertEquals(11111111, row.get(2));
+            assertEquals(111111111111L, row.get(3));
+            assertEquals(true, row.get(4));
+        }
+        {
+            List<Object> row = rows.get(1);
+            assertEquals((short)2, row.get(0));
+            assertEquals(null, row.get(1));
+            assertEquals(null, row.get(2));
+            assertEquals(null, row.get(3));
+            assertEquals(null, row.get(4));
+        }
+    }
+
+    @Test
+    public void testNativeDecimal() throws Exception
+    {
+        if (!canTest) {
+            return;
+        }
+
+        String table = "TEST4";
+
+        dropTable(table);
+        executeSQL(String.format("CREATE TABLE %S (ITEM1 DECIMAL(20,2), ITEM2 NUMERIC(20,2), ITEM3 SMALLMONEY, ITEM4 MONEY, ITEM5 REAL, ITEM6 FLOAT)", table));
+
+        tester.run(convertYml("/sqlserver/yml/test-native-decimal.yml"));
+
+        List<List<Object>> rows = select(table);
+        assertEquals(2, rows.size());
+        {
+            List<Object> row = rows.get(0);
+            assertEquals(new BigDecimal("1.20"), row.get(0));
+            assertEquals(new BigDecimal("12345678901234567.89"), row.get(1));
+            assertEquals(new BigDecimal("123.4500"), row.get(2));
+            assertEquals(new BigDecimal("678.9000"), row.get(3));
+            assertEquals(0.01234F, row.get(4));
+            assertEquals(0.05678D, row.get(5));
+        }
+        {
+            List<Object> row = rows.get(1);
+            assertEquals(new BigDecimal("2.30"), row.get(0));
+            assertEquals(null, row.get(1));
+            assertEquals(null, row.get(2));
+            assertEquals(null, row.get(3));
+            assertEquals(null, row.get(4));
+            assertEquals(null, row.get(5));
+        }
+    }
+
+    @Test
+    public void testNativeDate() throws Exception
+    {
+        if (!canTest) {
+            return;
+        }
+
+        String table = "TEST5";
+
+        dropTable(table);
+        executeSQL(String.format("CREATE TABLE %S (ITEM1 DATE, ITEM2 SMALLDATETIME, ITEM3 DATETIME, ITEM4 DATETIME2, ITEM5 DATETIME2(2), ITEM6 TIME, ITEM7 TIME(2))", table));
+
+        tester.run(convertYml("/sqlserver/yml/test-native-date.yml"));
+
+        List<List<Object>> rows = select(table);
+        assertEquals(2, rows.size());
+        {
+            List<Object> row = rows.get(0);
+            assertEquals(createDate("2016/01/23"), row.get(0));
+            assertEquals(createTimestamp("2016/01/24 11:23:00", 0), row.get(1));
+            assertEquals(createTimestamp("2016/01/25 11:22:33", 457000000), row.get(2));
+            // Embulk timestamp doesn't support values under microseconds.
+            assertEquals(createTimestamp("2016/01/26 11:22:33", 123456000), row.get(3));
+            assertEquals(createTimestamp("2016/01/27 11:22:33", 890000000), row.get(4));
+            // Embulk timestamp doesn't support values under microseconds.
+            assertEquals(createTime("11:22:33", 123456000), row.get(5));
+            assertEquals(createTime("11:22:33", 890000000), row.get(6));
+        }
+        {
+            List<Object> row = rows.get(1);
+            assertEquals(null, row.get(0));
+            assertEquals(null, row.get(1));
+            assertEquals(null, row.get(2));
+            assertEquals(null, row.get(3));
+            assertEquals(null, row.get(4));
+            assertEquals(null, row.get(5));
+            assertEquals(null, row.get(6));
+        }
+    }
+
+    @Test
+    public void testNative() throws Exception
+    {
+        if (!canTest) {
+            return;
+        }
+
+        String table = "TEST1";
+
+        dropTable(table);
+        createTable(table);
+        insertRecord(table);
+
+        tester.run(convertYml("/sqlserver/yml/test-native.yml"));
+
+        assertTable(1, table);
+    }
+
     private void assertTable(int skip, String table) throws Exception
     {
         assertTable(skip, table, false);
@@ -219,11 +383,11 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         {
             Iterator<Object> i2 = i1.next().iterator();
             assertEquals("A001", i2.next());
-            assertEquals(Short.valueOf((short)0), i2.next());
-            assertEquals(Short.valueOf((short)1234), i2.next());
-            assertEquals(Integer.valueOf(123456), i2.next());
-            assertEquals(Long.valueOf(12345678901L), i2.next());
-            assertEquals(Boolean.FALSE, i2.next());
+            assertEquals((short)0, i2.next());
+            assertEquals((short)1234, i2.next());
+            assertEquals(123456, i2.next());
+            assertEquals(12345678901L, i2.next());
+            assertEquals(false, i2.next());
             assertEquals(new BigDecimal("1.23"), i2.next());
             assertEquals(new BigDecimal("3.456"), i2.next());
             assertEquals(new BigDecimal("12.3400"), i2.next());
@@ -249,11 +413,11 @@ public class SQLServerOutputPluginTest extends AbstractJdbcOutputPluginTest
         {
             Iterator<Object> i2 = i1.next().iterator();
             assertEquals("A002", i2.next());
-            assertEquals(Short.valueOf((short)255), i2.next());
-            assertEquals(Short.valueOf((short)-32768), i2.next());
-            assertEquals(Integer.valueOf(-2147483648), i2.next());
-            assertEquals(Long.valueOf(-9223372036854775808L), i2.next());
-            assertEquals(Boolean.TRUE, i2.next());
+            assertEquals((short)255, i2.next());
+            assertEquals((short)-32768, i2.next());
+            assertEquals(-2147483648, i2.next());
+            assertEquals(-9223372036854775808L, i2.next());
+            assertEquals(true, i2.next());
             assertEquals(new BigDecimal("-9999999999.99"), i2.next());
             assertEquals(new BigDecimal("-99.999"), i2.next());
             assertEquals(new BigDecimal("-214748.3648"), i2.next());

data/src/test/resources/sqlserver/data/test2/test2.csv

@@ -0,0 +1,2 @@
+A001,TEST,Ａ,あいうえ,あいうえおかきく,あいうえお
+A002,,,,,

data/src/test/resources/sqlserver/data/test3/test3.csv

@@ -0,0 +1,2 @@
+1,1111,11111111,111111111111,1
+2,,,,

data/src/test/resources/sqlserver/data/test4/test4.csv

@@ -0,0 +1,2 @@
+1.2,12345678901234567.89,123.45,678.9,0.01234,0.05678
+2.3,,,,,

data/src/test/resources/sqlserver/data/test5/test5.csv

@@ -0,0 +1,2 @@
+2016/1/23,2016/1/24 11:22:33,2016/1/25 11:22:33.457,2016/1/26 11:22:33.1234567,2016/1/27 11:22:33.89,11:22:33.1234567,11:22:33.89
+,,,,,,

data/src/test/resources/sqlserver/yml/test-native-date.yml

@@ -0,0 +1,26 @@
+in:
+  type: file
+  path_prefix: '/sqlserver/data/test5/test5.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ITEM1, type: timestamp, format: '%Y/%m/%d'}
+    - {name: ITEM2, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+    - {name: ITEM3, type: timestamp, format: '%Y/%m/%d %H:%M:%S.%N'}
+    - {name: ITEM4, type: timestamp, format: '%Y/%m/%d %H:%M:%S.%N'}
+    - {name: ITEM5, type: timestamp, format: '%Y/%m/%d %H:%M:%S.%N'}
+    - {name: ITEM6, type: timestamp, format: '%H:%M:%S.%N'}
+    - {name: ITEM7, type: timestamp, format: '%H:%M:%S.%N'}
+out:
+    type: sqlserver
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST5
+    mode: insert_direct
+    insert_method: native

data/src/test/resources/sqlserver/yml/test-native-decimal.yml

@@ -0,0 +1,25 @@
+in:
+  type: file
+  path_prefix: '/sqlserver/data/test4/test4.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ITEM1, type: double}
+    - {name: ITEM2, type: string}
+    - {name: ITEM3, type: string}
+    - {name: ITEM4, type: string}
+    - {name: ITEM5, type: double}
+    - {name: ITEM6, type: double}
+out:
+    type: sqlserver
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST4
+    mode: insert_direct
+    insert_method: native

data/src/test/resources/sqlserver/yml/test-native-integer.yml

@@ -0,0 +1,24 @@
+in:
+  type: file
+  path_prefix: '/sqlserver/data/test3/test3.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ITEM1, type: long}
+    - {name: ITEM2, type: long}
+    - {name: ITEM3, type: long}
+    - {name: ITEM4, type: long}
+    - {name: ITEM5, type: long}
+out:
+    type: sqlserver
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST3
+    mode: insert_direct
+    insert_method: native

data/src/test/resources/sqlserver/yml/test-native-string.yml

@@ -0,0 +1,25 @@
+in:
+  type: file
+  path_prefix: '/sqlserver/data/test2/test2.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ITEM1, type: string}
+    - {name: ITEM2, type: string}
+    - {name: ITEM3, type: string}
+    - {name: ITEM4, type: string}
+    - {name: ITEM5, type: string}
+    - {name: ITEM6, type: string}
+out:
+    type: sqlserver
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST2
+    mode: insert_direct
+    insert_method: native

data/src/test/resources/sqlserver/yml/test-native.yml

@@ -0,0 +1,44 @@
+in:
+  type: file
+  path_prefix: '/sqlserver/data/test1/test1.csv'
+  parser:
+    charset: UTF-8
+    newline: CRLF
+    type: csv
+    delimiter: ','
+    quote: ''
+    columns:
+    - {name: ID, type: string}
+    - {name: TINYINT_ITEM, type: long}
+    - {name: SMALLINT_ITEM, type: long}
+    - {name: INT_ITEM, type: long}
+    - {name: BIGINT_ITEM, type: long}
+    - {name: BIT_ITEM, type: boolean}
+    - {name: DECIMAL_ITEM, type: string}
+    - {name: NUMERIC_ITEM, type: string}
+    - {name: SMALLMONEY_ITEM, type: string}
+    - {name: MONEY_ITEM, type: string}
+    - {name: REAL_ITEM, type: double}
+    - {name: FLOAT_ITEM, type: double}
+    - {name: CHAR_ITEM, type: string}
+    - {name: VARCHAR_ITEM, type: string}
+    - {name: TEXT_ITEM, type: string}
+    - {name: NCHAR_ITEM, type: string}
+    - {name: NVARCHAR_ITEM, type: string}
+    - {name: NTEXT_ITEM, type: string}
+    - {name: DATE_ITEM, type: timestamp, format: '%Y/%m/%d'}
+    - {name: DATETIME_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S.%N'}
+    - {name: DATETIME2_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S.%N'}
+    - {name: DATETIME2_2_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S.%N'}
+    - {name: SMALLDATETIME_ITEM, type: timestamp, format: '%Y/%m/%d %H:%M:%S'}
+    - {name: TIME_ITEM, type: timestamp, format: '%H:%M:%S.%N'}
+    - {name: TIME_2_ITEM, type: timestamp, format: '%H:%M:%S.%N'}
+out:
+    type: sqlserver
+    host: localhost
+    database: TESTDB
+    user: TEST_USER
+    password: test_pw
+    table: TEST1
+    mode: insert_direct
+    insert_method: native

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sqlserver
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -21,22 +21,37 @@ files:
 - build.gradle
 - lib/embulk/output/sqlserver.rb
 - src/main/java/org/embulk/output/SQLServerOutputPlugin.java
+- src/main/java/org/embulk/output/sqlserver/InsertMethod.java
+- src/main/java/org/embulk/output/sqlserver/NativeBatchInsert.java
 - src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java
 - src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java
+- src/main/java/org/embulk/output/sqlserver/SmallDateTimeFormat.java
+- src/main/java/org/embulk/output/sqlserver/nativeclient/NativeClient.java
+- src/main/java/org/embulk/output/sqlserver/nativeclient/NativeClientWrapper.java
+- src/main/java/org/embulk/output/sqlserver/nativeclient/ODBC.java
 - src/main/java/org/embulk/output/sqlserver/setter/SQLServerByteColumnSetter.java
 - src/main/java/org/embulk/output/sqlserver/setter/SQLServerColumnSetterFactory.java
 - src/main/java/org/embulk/output/sqlserver/setter/SQLServerSqlTimeColumnSetter.java
 - src/test/java/org/embulk/output/sqlserver/PreciseTime.java
 - src/test/java/org/embulk/output/sqlserver/SQLServerOutputPluginTest.java
 - src/test/resources/sqlserver/data/test1/test1.csv
+- src/test/resources/sqlserver/data/test2/test2.csv
+- src/test/resources/sqlserver/data/test3/test3.csv
+- src/test/resources/sqlserver/data/test4/test4.csv
+- src/test/resources/sqlserver/data/test5/test5.csv
 - src/test/resources/sqlserver/yml/test-insert-direct.yml
 - src/test/resources/sqlserver/yml/test-insert.yml
+- src/test/resources/sqlserver/yml/test-native-date.yml
+- src/test/resources/sqlserver/yml/test-native-decimal.yml
+- src/test/resources/sqlserver/yml/test-native-integer.yml
+- src/test/resources/sqlserver/yml/test-native-string.yml
+- src/test/resources/sqlserver/yml/test-native.yml
 - src/test/resources/sqlserver/yml/test-replace-long-name.yml
 - src/test/resources/sqlserver/yml/test-replace.yml
 - src/test/resources/sqlserver/yml/test-string-timestamp.yml
 - src/test/resources/sqlserver/yml/test-truncate-insert.yml
-- classpath/embulk-output-jdbc-0.5.0.jar
-- classpath/embulk-output-sqlserver-0.5.0.jar
+- classpath/embulk-output-jdbc-0.5.1.jar
+- classpath/embulk-output-sqlserver-0.5.1.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0