embulk-output-mysql 0.7.7 → 0.8.0

data/src/test/java/org/embulk/output/mysql/CreateTableTest.java

@@ -0,0 +1,79 @@
+package org.embulk.output.mysql;
+
+import static org.embulk.output.mysql.MySQLTests.execute;
+import static org.embulk.output.mysql.MySQLTests.selectRecords;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+
+import org.embulk.config.ConfigDiff;
+import org.embulk.config.ConfigSource;
+import org.embulk.output.MySQLOutputPlugin;
+import org.embulk.spi.OutputPlugin;
+import org.embulk.test.EmbulkTests;
+import org.embulk.test.TestingEmbulk;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.google.common.io.Resources;
+
+public class CreateTableTest
+{
+    private static final String BASIC_RESOURCE_PATH = "org/embulk/output/mysql/test/expect/create_table/";
+
+    private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
+    {
+        return embulk.loadYamlResource(BASIC_RESOURCE_PATH + fileName);
+    }
+
+    private static String readResource(String fileName)
+    {
+        return EmbulkTests.readResource(BASIC_RESOURCE_PATH + fileName);
+    }
+
+    @Rule
+    public TestingEmbulk embulk = TestingEmbulk.builder()
+            .registerPlugin(OutputPlugin.class, "mysql", MySQLOutputPlugin.class)
+            .build();
+
+    private ConfigSource baseConfig;
+
+    @Before
+    public void setup()
+    {
+        baseConfig = MySQLTests.baseConfig();
+        execute(readResource("setup.sql")); // setup rows
+    }
+
+    @Test
+    public void testTableOption() throws Exception
+    {
+        Path in1 = toPath("test1.csv");
+        TestingEmbulk.RunResult result1 = embulk.runOutput(baseConfig.merge(loadYamlResource(embulk, "test_table_option.yml")), in1);
+        assertThat(selectRecords(embulk, "test1"), is(readResource("test_table_option_expected.csv")));
+        //assertThat(result1.getConfigDiff(), is((ConfigDiff) loadYamlResource(embulk, "test_expected.diff")));
+    }
+
+    @Test
+    public void testTableConstraint() throws Exception
+    {
+        Path in1 = toPath("test1.csv");
+        // exception will be thrown without table constraint because auto column must be defined as a key.
+        TestingEmbulk.RunResult result1 = embulk.runOutput(baseConfig.merge(loadYamlResource(embulk, "test_table_constraint.yml")), in1);
+        assertThat(selectRecords(embulk, "test1"), is(readResource("test_table_constraint_expected.csv")));
+        //assertThat(result1.getConfigDiff(), is((ConfigDiff) loadYamlResource(embulk, "test_expected.diff")));
+    }
+
+    private Path toPath(String fileName) throws URISyntaxException
+    {
+        URL url = Resources.getResource(BASIC_RESOURCE_PATH + fileName);
+        return FileSystems.getDefault().getPath(new File(url.toURI()).getAbsolutePath());
+    }
+
+}

data/src/test/java/org/embulk/output/mysql/MySQLTests.java

@@ -0,0 +1,69 @@
+package org.embulk.output.mysql;
+
+import static java.util.Locale.ENGLISH;
+import static org.embulk.test.EmbulkTests.readSortedFile;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.embulk.config.ConfigSource;
+import org.embulk.test.EmbulkTests;
+import org.embulk.test.TestingEmbulk;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableList;
+import com.google.common.io.ByteStreams;
+
+public class MySQLTests
+{
+    public static ConfigSource baseConfig()
+    {
+        return EmbulkTests.config("EMBULK_OUTPUT_MYSQL_TEST_CONFIG");
+    }
+
+    public static void execute(String sql)
+    {
+        ConfigSource config = baseConfig();
+
+        ImmutableList.Builder<String> args = ImmutableList.builder();
+        args.add("mysql")
+                .add("-u")
+                .add(config.get(String.class, "user"));
+        if (!config.get(String.class, "password").isEmpty()) {
+            args.add("-p" + config.get(String.class, "password"));
+        }
+        args
+                .add("-h")
+                .add(config.get(String.class, "host"))
+                .add("-P")
+                .add(config.get(String.class, "port", "3306"))
+                .add(config.get(String.class, "database"))
+                .add("-e")
+                .add(sql);
+
+        ProcessBuilder pb = new ProcessBuilder(args.build());
+        pb.redirectErrorStream(true);
+        int code;
+        try {
+            Process process = pb.start();
+            ByteStreams.copy(process.getInputStream(), System.out);
+            code = process.waitFor();
+        } catch (IOException | InterruptedException ex) {
+            throw Throwables.propagate(ex);
+        }
+        if (code != 0) {
+            throw new RuntimeException(String.format(ENGLISH,
+                    "Command finished with non-zero exit code. Exit code is %d.", code));
+        }
+    }
+
+    public static String selectRecords(TestingEmbulk embulk, String tableName) throws IOException
+    {
+        Path temp = embulk.createTempFile("txt");
+        Files.delete(temp);
+        // test user needs FILE privilege
+        execute("select * from " + tableName + " into outfile '" + temp.toString().replace("\\", "\\\\") + "' fields terminated by ','");
+        return readSortedFile(temp);
+    }
+}

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/setup.sql

@@ -0,0 +1,8 @@
+drop table if exists test1;
+
+create table test1 (
+    id              char(4),
+    int_item        int,
+    varchar_item    varchar(8),
+    primary key (id)
+);

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test1.csv

@@ -0,0 +1,4 @@
+id:string,int_item:long,varchar_item:string
+A001,9,a
+A002,0,b
+A003,9,c

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_expected.diff

@@ -0,0 +1,2 @@
+in: {}
+out: {}

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_insert_after_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: insert
+after_load: "update test1 set varchar_item = 'x' where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_insert_after_load_expected.csv

@@ -0,0 +1,5 @@
+A001,9,x
+A002,0,b
+A003,9,x
+B001,0,z
+B002,9,x

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_insert_direct_after_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: insert_direct
+after_load: "update test1 set varchar_item = 'x' where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_merge_after_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: merge
+after_load: "update test1 set varchar_item = 'x' where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_merge_after_load_expected.csv

@@ -0,0 +1,5 @@
+A001,9,x
+A002,0,b
+A003,9,x
+B001,0,z
+B002,9,x

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_merge_direct_after_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: merge_direct
+after_load: "update test1 set varchar_item = 'x' where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_replace_after_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: replace
+after_load: "update test1 set varchar_item = 'x' where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_replace_after_load_expected.csv

@@ -0,0 +1,3 @@
+A001,9,x
+A002,0,b
+A003,9,x

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_truncate_insert_after_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: truncate_insert
+after_load: "update test1 set varchar_item = 'x' where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_truncate_insert_after_load_expected.csv

@@ -0,0 +1,3 @@
+A001,9,x
+A002,0,b
+A003,9,x

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/setup.sql

@@ -0,0 +1,8 @@
+drop table if exists test1;
+
+create table test1 (
+    id              char(4),
+    int_item        int,
+    varchar_item    varchar(8),
+    primary key (id)
+);

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test1.csv

@@ -0,0 +1,4 @@
+id:string,int_item:long,varchar_item:string
+A001,9,a
+A002,0,b
+A003,9,c

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_expected.diff

@@ -0,0 +1,2 @@
+in: {}
+out: {}

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_insert_before_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: insert
+before_load: "delete from test1 where int_item = 9"

data/src/test/resources/{mysql/data/test1.csv → org/embulk/output/mysql/test/expect/before_load/test_insert_before_load_expected.csv}

@@ -1,3 +1,4 @@
 A001,9,a
 A002,0,b
 A003,9,c
+B001,0,z

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_insert_direct_before_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: insert_direct
+before_load: "delete from test1 where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_merge_before_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: merge
+before_load: "delete from test1 where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_merge_before_load_expected.csv

@@ -0,0 +1,4 @@
+A001,9,a
+A002,0,b
+A003,9,c
+B001,0,z

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_merge_direct_before_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: merge_direct
+before_load: "delete from test1 where int_item = 9"

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_truncate_insert_before_load.yml

@@ -0,0 +1,3 @@
+table: test1
+mode: truncate_insert
+before_load: "insert into test1 values('C001', 0, 'x')"

data/src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_truncate_insert_before_load_expected.csv

@@ -0,0 +1,4 @@
+A001,9,a
+A002,0,b
+A003,9,c
+C001,0,x

data/src/test/resources/org/embulk/output/mysql/test/expect/create_table/setup.sql

@@ -0,0 +1 @@
+drop table if exists test1;

data/src/test/resources/org/embulk/output/mysql/test/expect/create_table/test1.csv

@@ -0,0 +1,4 @@
+id:long,value:string
+0,a
+0,b
+0,c

data/src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_constraint.yml

@@ -0,0 +1,5 @@
+table: test1
+mode: insert
+create_table_constraint: 'primary key(id)'
+column_options:
+  id: {type: 'int auto_increment'}

data/src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_constraint_expected.csv

@@ -0,0 +1,3 @@
+1,a
+2,b
+3,c

data/src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_option.yml

@@ -0,0 +1,5 @@
+table: test1
+mode: insert
+create_table_option: 'auto_increment=100'
+column_options:
+  id: {type: 'int auto_increment primary key'}

data/src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_option_expected.csv

@@ -0,0 +1,3 @@
+100,a
+101,b
+102,c

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mysql
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,27 +19,49 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.7.jar
-- classpath/embulk-output-mysql-0.7.7.jar
-- classpath/mysql-connector-java-5.1.34.jar
+- classpath/embulk-output-jdbc-0.8.0.jar
+- classpath/embulk-output-mysql-0.8.0.jar
+- default_jdbc_driver/mysql-connector-java-5.1.44.jar
 - lib/embulk/output/mysql.rb
 - src/main/java/org/embulk/output/MySQLOutputPlugin.java
+- src/main/java/org/embulk/output/MySQLTimeZoneComparison.java
 - src/main/java/org/embulk/output/mysql/MySQLBatchInsert.java
 - src/main/java/org/embulk/output/mysql/MySQLOutputConnection.java
 - src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java
-- src/test/java/org/embulk/output/mysql/MySQLOutputPluginTest.java
-- src/test/resources/mysql/data/test1.csv
-- src/test/resources/mysql/yml/test-insert-after-load.yml
-- src/test/resources/mysql/yml/test-insert-before-load.yml
-- src/test/resources/mysql/yml/test-insert-direct-after-load.yml
-- src/test/resources/mysql/yml/test-insert-direct-before-load.yml
-- src/test/resources/mysql/yml/test-merge-after-load.yml
-- src/test/resources/mysql/yml/test-merge-before-load.yml
-- src/test/resources/mysql/yml/test-merge-direct-after-load.yml
-- src/test/resources/mysql/yml/test-merge-direct-before-load.yml
-- src/test/resources/mysql/yml/test-replace-after-load.yml
-- src/test/resources/mysql/yml/test-truncate-insert-after-load.yml
-- src/test/resources/mysql/yml/test-truncate-insert-before-load.yml
+- src/test/java/org/embulk/output/mysql/AfterLoadTest.java
+- src/test/java/org/embulk/output/mysql/BeforeLoadTest.java
+- src/test/java/org/embulk/output/mysql/CreateTableTest.java
+- src/test/java/org/embulk/output/mysql/MySQLTests.java
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/setup.sql
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test1.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_expected.diff
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_insert_after_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_insert_after_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_insert_direct_after_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_merge_after_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_merge_after_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_merge_direct_after_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_replace_after_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_replace_after_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_truncate_insert_after_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/after_load/test_truncate_insert_after_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/setup.sql
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test1.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_expected.diff
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_insert_before_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_insert_before_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_insert_direct_before_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_merge_before_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_merge_before_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_merge_direct_before_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_truncate_insert_before_load.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/before_load/test_truncate_insert_before_load_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/create_table/setup.sql
+- src/test/resources/org/embulk/output/mysql/test/expect/create_table/test1.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_constraint.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_constraint_expected.csv
+- src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_option.yml
+- src/test/resources/org/embulk/output/mysql/test/expect/create_table/test_table_option_expected.csv
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0