embulk-output-redshift 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f9b1303b4c1343a10b77b15b07fca1536c919ac
-  data.tar.gz: 3fe7932bc6a6a3d0125c88e9e60c8e9ac05cb4d6
+  metadata.gz: 1d4312dc6d69048d1110819001f7bdde9ad8325d
+  data.tar.gz: 2010563c7f915628a45777464860af452fdd1b38
 SHA512:
-  metadata.gz: e06bf310d402011178bb190ae8ad2240ad97ddebba96e54f681e49890e52de6cb5175c6a78152bb124a70159a345a21ad5aa67745e145a34116598736f4e28bf
-  data.tar.gz: 434386a4927d5f7df605142e93c5870ec3c7b3194bac5c7d3b0b56161c51beec09f44480510dcbe290412a3846c125874caa62b95a9651ac1631738a457eaad0
+  metadata.gz: 4dbcc3cc2b2cd76abec1ab8e1e542690d1d45fece61e42183303c8d8655b67fea1686878f1e4d872bd1260feccf4fb43ad3212a4b6c226edd9225de3bdff9a17
+  data.tar.gz: d000f9b23aba4bcd91844e8ecfcf5bd631eaa1f492376986dc847daa03a4ffcf5c3b278545f14debb0711eaf27519f4be9ee1732846e958a004f142d4042abf1

data/src/main/java/org/embulk/output/redshift/RedshiftOutputConnection.java

@@ -5,7 +5,6 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import com.google.common.base.Optional;
 import org.embulk.output.jdbc.MergeConfig;
 import org.slf4j.Logger;
 import org.embulk.spi.Exec;
@@ -134,14 +133,14 @@ public class RedshiftOutputConnection
         sb.append("DELETE FROM ");
         quoteIdentifierString(sb, toTable);
         sb.append(" USING (");
-        for(int i=0; i < fromTables.size(); i++) {
-            if(i != 0) { sb.append(" UNION ALL "); }
+        for (int i = 0; i < fromTables.size(); i++) {
+            if (i != 0) { sb.append(" UNION ALL "); }
             sb.append("SELECT * FROM ");
             quoteIdentifierString(sb, fromTables.get(i));
         }
         sb.append(") S WHERE (");
         List<String> mergeKeys = mergeConfig.getMergeKeys();
-        for(int i=0; i < mergeKeys.size(); i++) {
+        for (int i = 0; i < mergeKeys.size(); i++) {
             if (i != 0) { sb.append(" AND "); }
             sb.append("S.");
             quoteIdentifierString(sb, mergeKeys.get(i));
@@ -155,10 +154,15 @@ public class RedshiftOutputConnection
         sb.append("INSERT INTO ");
         quoteIdentifierString(sb, toTable);
         sb.append(" (");
-        for(int i=0; i < fromTables.size(); i++) {
-            if(i != 0) { sb.append(" UNION ALL "); }
+        for (int i = 0; i < schema.getCount(); i++) {
+            if (i != 0) { sb.append(", "); }
+            quoteIdentifierString(sb, schema.getColumnName(i));
+        }
+        sb.append(") (");
+        for (int i = 0; i < fromTables.size(); i++) {
+            if (i != 0) { sb.append(" UNION ALL "); }
             sb.append("SELECT ");
-            for(int j=0; j < schema.getCount(); j++) {
+            for (int j = 0; j < schema.getCount(); j++) {
                 if (j != 0) { sb.append(", "); }
                 quoteIdentifierString(sb, schema.getColumnName(j));
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -25,9 +25,9 @@ files:
 - classpath/aws-java-sdk-sts-1.10.33.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.6.4.jar
-- classpath/embulk-output-postgresql-0.6.4.jar
-- classpath/embulk-output-redshift-0.6.4.jar
+- classpath/embulk-output-jdbc-0.6.5.jar
+- classpath/embulk-output-postgresql-0.6.5.jar
+- classpath/embulk-output-redshift-0.6.5.jar
 - classpath/httpclient-4.3.6.jar
 - classpath/httpcore-4.3.3.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar