embulk-output-mysql 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b67a848e2202ebc31901130301005107ca6897
-  data.tar.gz: f7cb4f67515ea512dbb6135da0ad2a89c498500f
+  metadata.gz: c26cb004402026d14a78720765e9c43fbf51837b
+  data.tar.gz: 971f0061e593d174aa77b55bc2a9526b7baeb754
 SHA512:
-  metadata.gz: 963d894c295cbe6c0d242784dfbac06b062a6c1611b487adc8020c69ccce26f7d296060dff11acee1ed1db3c84f7c8d0c4dd74fae9e92945999c65f26b6afd42
-  data.tar.gz: ada63428a1351d41140ace617b9fe7a37317e1e696b50104bedc4bd00c0e03f7b1d9c8cee29c07fa8d2a248adfd1f6d2c373aa091a20494a034f04c917fc6dc4
+  metadata.gz: 5e360066024cc173d4237fc9469acba6dd6feaa5d54f6e5f2faf868e688b180ff8e345bc9136cfd34497de0840085efa8fe4f27916c032f5b1b07cc624d90adb
+  data.tar.gz: 3fb0cc71310ce53577b20aafe9d18e07d23f38072e9110da53d67afe4cd22d836190a8231cac54150420387d99d109e5ad2589c86570a927c915752c1453d2ad

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

@@ -3,14 +3,12 @@ package org.embulk.output;
 import java.util.Properties;
 import java.io.IOException;
 import java.sql.SQLException;
-import java.sql.Connection;
-import org.embulk.spi.Exec;
+
+import org.embulk.output.mysql.MySQLBatchUpsert;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
-import org.embulk.output.jdbc.JdbcOutputConnection;
 import org.embulk.output.jdbc.BatchInsert;
-import org.embulk.output.jdbc.JdbcOutputConnector;
 import org.embulk.output.mysql.MySQLOutputConnector;
 import org.embulk.output.mysql.MySQLBatchInsert;
 
@@ -96,6 +94,7 @@ public class MySQLOutputPlugin
     @Override
     protected BatchInsert newBatchInsert(PluginTask task) throws IOException, SQLException
     {
-        return new MySQLBatchInsert(getConnector(task, true));
+        MySQLOutputConnector connector = getConnector(task, true);
+        return task.getMode().isMerge() ? new MySQLBatchUpsert(connector) : new MySQLBatchInsert(connector);
     }
 }

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

@@ -0,0 +1,22 @@
+package org.embulk.output.mysql;
+
+import org.embulk.output.jdbc.JdbcOutputConnection;
+import org.embulk.output.jdbc.JdbcSchema;
+import java.io.IOException;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public class MySQLBatchUpsert extends MySQLBatchInsert {
+
+    public MySQLBatchUpsert(MySQLOutputConnector connector) throws IOException, SQLException {
+        super(connector);
+    }
+
+    @Override
+    protected PreparedStatement newPreparedStatement(JdbcOutputConnection connection,
+                                                     String loadTable, JdbcSchema insertSchema) throws SQLException
+    {
+        return connection.prepareUpsertSql(loadTable, insertSchema);
+    }
+
+}

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

@@ -2,10 +2,9 @@ package org.embulk.output.mysql;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import org.embulk.spi.Exec;
-import org.embulk.output.jdbc.BatchInsert;
+
+import org.embulk.output.jdbc.JdbcSchema;
 import org.embulk.output.jdbc.JdbcOutputConnection;
-import org.embulk.output.jdbc.JdbcColumn;
 
 public class MySQLOutputConnection
         extends JdbcOutputConnection
@@ -17,6 +16,36 @@ public class MySQLOutputConnection
         connection.setAutoCommit(autoCommit);
     }
 
+    @Override
+    protected String buildPrepareUpsertSql(String toTable, JdbcSchema toTableSchema) throws SQLException
+    {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("INSERT INTO ");
+        quoteIdentifierString(sb, toTable);
+
+        sb.append(" (");
+        for (int i=0; i < toTableSchema.getCount(); i++) {
+            if(i != 0) { sb.append(", "); }
+            quoteIdentifierString(sb, toTableSchema.getColumnName(i));
+        }
+        sb.append(") VALUES (");
+        for(int i=0; i < toTableSchema.getCount(); i++) {
+            if(i != 0) { sb.append(", "); }
+            sb.append("?");
+        }
+        sb.append(")");
+
+        sb.append(" ON DUPLICATE KEY UPDATE ");
+        for (int i=0; i < toTableSchema.getCount(); i++) {
+            if(i != 0) { sb.append(", "); }
+            final String columnName = quoteIdentifierString(toTableSchema.getColumnName(i));
+            sb.append(columnName).append(" = VALUES(").append(columnName).append(")");
+        }
+
+        return sb.toString();
+    }
+
     @Override
     protected String convertTypeName(String typeName)
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-mysql
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -22,10 +22,11 @@ files:
 - lib/embulk/output/mysql.rb
 - src/main/java/org/embulk/output/MySQLOutputPlugin.java
 - src/main/java/org/embulk/output/mysql/MySQLBatchInsert.java
+- src/main/java/org/embulk/output/mysql/MySQLBatchUpsert.java
 - src/main/java/org/embulk/output/mysql/MySQLOutputConnection.java
 - src/main/java/org/embulk/output/mysql/MySQLOutputConnector.java
-- classpath/embulk-output-jdbc-0.2.2.jar
-- classpath/embulk-output-mysql-0.2.2.jar
+- classpath/embulk-output-jdbc-0.2.3.jar
+- classpath/embulk-output-mysql-0.2.3.jar
 - classpath/mysql-connector-java-5.1.34.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses: