embulk-output-mysql 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe4b5952e11bde0ca8410bc18d9ce6bfe8cdc481
-  data.tar.gz: 6b3184a514edc1e931fc6f325c71b2e3c2e1136c
+  metadata.gz: cc3ab6f3a5bfb39779736584783e384b4decd8c8
+  data.tar.gz: 2288573b82a2e38062a5315ac0e0035838af84b0
 SHA512:
-  metadata.gz: 4d564b1e498ecc0db5059b0a00d5030bce0fe8f65ac4544b8be23ebeb29d503ca6c318130dd52506eef03bf4c89bab9e6d1e94c2ad20464334e0d3adb144735a
-  data.tar.gz: c191d46f1edba132f007cab5a3450430ea5b13a82ae33e6da245ffb8f1a4ee18b7a760e808458a66c68bfad4aff5322a6e7e361b32689aa3881d0feb46797daf
+  metadata.gz: fd5382b3fd1051adc59d959c5f0d1ad0b39e2f4801d32a1879942035ebf01a74e375f4b2e856722885d070e03389ba6fd440b86f16f115a51554d1a79aa83708
+  data.tar.gz: 14f2a76d0917eb363a988eb7ee0384c302222d0a2eb71ac34435f89b488954c2aa20999cd1c03ea751bafc602d902628ff1bd533cd41dbc478bf3821e3a1523d

data/README.md

@@ -10,6 +10,7 @@ MySQL output plugin for Embulk loads records to MySQL.
 
 ## Configuration
 
+- **driver_path**: path to the jar file of the MySQL JDBC driver. If not set, the bundled JDBC driver (MySQL Connector/J 5.1.34) will be used. (string)
 - **host**: database host name (string, required)
 - **port**: database port number (integer, default: 3306)
 - **user**: database login user name (string, required)
@@ -18,6 +19,8 @@ MySQL output plugin for Embulk loads records to MySQL.
 - **database**: destination database name (string, required)
 - **temp_database**: database name for intermediate tables. by default, intermediate tables will be created in the database specified by `database`. (string, optional)
 - **table**: destination table name (string, required)
+- **create_table_constraint** table constraint added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
+- **create_table_option** table option added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
 - **options**: extra connection properties (hash, default: {})
 - **retry_limit** max retry count for database operations (integer, default: 12)
 - **retry_wait** initial retry wait time in milliseconds (integer, default: 1000 (1 second))

data/build.gradle

@@ -1,6 +1,7 @@
 dependencies {
     compile project(':embulk-output-jdbc')
     compile 'mysql:mysql-connector-java:5.1.34'
+    defaultJdbcDriver 'mysql:mysql-connector-java:5.1.34'
 
     testCompile 'org.embulk:embulk-standards:0.8.22'
 }

data/src/main/java/org/embulk/output/MySQLOutputPlugin.java

@@ -25,6 +25,10 @@ public class MySQLOutputPlugin
     public interface MySQLPluginTask
             extends PluginTask
     {
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
+
         @Config("host")
         public String getHost();
 
@@ -71,6 +75,8 @@ public class MySQLOutputPlugin
     {
         MySQLPluginTask t = (MySQLPluginTask) task;
 
+        loadDriver("com.mysql.jdbc.Driver", t.getDriverPath());
+
         String url = String.format("jdbc:mysql://%s:%d/%s",
                 t.getHost(), t.getPort(), t.getDatabase());
 

data/src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java

@@ -1,25 +1,20 @@
 package org.embulk.output.mysql;
 
 import java.util.Properties;
-import java.sql.Driver;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.SQLException;
+
 import org.embulk.output.jdbc.JdbcOutputConnector;
 
 public class MySQLOutputConnector
         implements JdbcOutputConnector
 {
-    private final Driver driver;
     private final String url;
     private final Properties properties;
 
     public MySQLOutputConnector(String url, Properties properties)
     {
-        try {
-            this.driver = new com.mysql.jdbc.Driver();  // new com.mysql.jdbc.Driver throws SQLException
-        } catch (SQLException ex) {
-            throw new RuntimeException(ex);
-        }
         this.url = url;
         this.properties = properties;
     }
@@ -27,7 +22,7 @@ public class MySQLOutputConnector
     @Override
     public MySQLOutputConnection connect(boolean autoCommit) throws SQLException
     {
-        Connection c = driver.connect(url, properties);
+        Connection c = DriverManager.getConnection(url, properties);
         try {
             MySQLOutputConnection con = new MySQLOutputConnection(c, autoCommit);
             c = null;

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/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.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,9 +19,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.12.jar
-- classpath/embulk-output-mysql-0.7.12.jar
-- classpath/mysql-connector-java-5.1.34.jar
+- classpath/embulk-output-jdbc-0.7.13.jar
+- classpath/embulk-output-mysql-0.7.13.jar
+- default_jdbc_driver/mysql-connector-java-5.1.34.jar
 - lib/embulk/output/mysql.rb
 - src/main/java/org/embulk/output/MySQLOutputPlugin.java
 - src/main/java/org/embulk/output/MySQLTimeZoneComparison.java
@@ -30,6 +30,7 @@ files:
 - src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java
 - 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
@@ -55,6 +56,12 @@ files:
 - 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