embulk-output-redshift 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d64af8464bfac5a262069e316fa1227072de6322
-  data.tar.gz: 4b17ad7085953c573fcc56186c5ab1ca93cec8ca
+  metadata.gz: 0f49d2ce2f0a28ab1a34ad8e0a1a5b3df3dac5e8
+  data.tar.gz: da8446b33c11ac4f1736d37ad60c9e3dd9faf2f8
 SHA512:
-  metadata.gz: c8d003c33121591debba7c54e942026caa25dfe9f2cf64622f1dd66cfbf8828b8639b149391497bb99659125050dbef00d4ff508beb32d91d401861a239dacc9
-  data.tar.gz: 765d334d8521f215d1165b82800bdd5ad3b25f3471fa86f22b4d0676670ada1ab72be25f4bafb87ab97903aa27a7d7173da0cf71830342709703eb88db9073c1
+  metadata.gz: f6f4a3167321def1c531d9e94f1988441309a9127949f508b660eae5a6dad5763e52c434681bf670f06026bf6aed8babfccb10f3193115468d06f639cb203d91
+  data.tar.gz: 8f7681e29c631b46570f87d43920f64f3b6e5c8440becdaf48aa5d71440acd9031a8cb227b78ab442fe1c18c33cea061fe580d8f15fd386874a930e150193b4e

data/README.md

@@ -98,7 +98,7 @@ Redshift output plugin for Embulk loads records to Redshift.
   * Transactional: Yes.
   * Resumable: No.
 * **merge**:
-  * Behavior: This mode writes rows to some intermediate tables first. If all those tasks run correctly, inserts new records from intermediate tables after updating records whose keys exist in intermediate tables. Namely, if merge keys of a record in the intermediate tables already exist in the target table, the target record is updated by the intermediate record, otherwise the intermediate record is inserted. If the target table doesn't exist, it is created automatically.
+  * Behavior: This mode writes rows to some intermediate tables first. If all those tasks run correctly, inserts new records from intermediate tables after updating records whose keys exist in intermediate tables. Namely, if merge keys of a record in the intermediate tables already exist in the target table, the target record is updated by the intermediate record, otherwise the intermediate record is inserted. If the target table doesn't exist, it is created automatically. NOTE: Merge does not work correctly if merge keys contain `NULL`s.
   * Transactional: Yes.
   * Resumable: Yes.
 

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

@@ -28,66 +28,21 @@ public class RedshiftOutputConnection
         connection.setAutoCommit(autoCommit);
     }
 
-    // Redshift does not support DROP TABLE IF EXISTS.
-    // Here runs DROP TABLE and ignores errors.
+    // ALTER TABLE cannot change the schema of a table
+    //
+    // Standard JDBC:
+    //     ALTER TABLE "public"."source" RENAME TO "public"."target"
+    // Redshift:
+    //     ALTER TABLE "public"."source" RENAME TO "target"
     @Override
-    public void dropTableIfExists(TableIdentifier table) throws SQLException
+    protected String buildRenameTableSql(TableIdentifier fromTable, TableIdentifier toTable)
     {
-        Statement stmt = connection.createStatement();
-        try {
-            String sql = String.format("DROP TABLE IF EXISTS %s", quoteTableIdentifier(table));
-            executeUpdate(stmt, sql);
-            commitIfNecessary(connection);
-        } catch (SQLException ex) {
-            // ignore errors.
-            // TODO here should ignore only 'table "XXX" does not exist' errors.
-            SQLException ignored = safeRollback(connection, ex);
-        } finally {
-            stmt.close();
-        }
-    }
-
-    // Redshift does not support DROP TABLE IF EXISTS.
-    // Dropping part runs DROP TABLE and ignores errors.
-    @Override
-    public void replaceTable(TableIdentifier fromTable, JdbcSchema schema, TableIdentifier toTable, Optional<String> additionalSql) throws SQLException
-    {
-        Statement stmt = connection.createStatement();
-        try {
-            try {
-                StringBuilder sb = new StringBuilder();
-                sb.append("DROP TABLE ");
-                quoteTableIdentifier(sb, toTable);
-                String sql = sb.toString();
-                executeUpdate(stmt, sql);
-            } catch (SQLException ex) {
-                // ignore errors.
-                // TODO here should ignore only 'table "XXX" does not exist' errors.
-                // rollback or comimt is required to recover failed transaction
-                SQLException ignored = safeRollback(connection, ex);
-            }
-
-            {
-                // ALTER TABLE cannot change schema of table
-                StringBuilder sb = new StringBuilder();
-                sb.append("ALTER TABLE ");
-                quoteTableIdentifier(sb, fromTable);
-                sb.append(" RENAME TO ");
-                quoteIdentifierString(sb, toTable.getTableName());
-                String sql = sb.toString();
-                executeUpdate(stmt, sql);
-            }
-
-            if (additionalSql.isPresent()) {
-                executeUpdate(stmt, additionalSql.get());
-            }
-
-            commitIfNecessary(connection);
-        } catch (SQLException ex) {
-            throw safeRollback(connection, ex);
-        } finally {
-            stmt.close();
-        }
+        StringBuilder sb = new StringBuilder();
+        sb.append("ALTER TABLE ");
+        quoteTableIdentifier(sb, fromTable);
+        sb.append(" RENAME TO ");
+        quoteIdentifierString(sb, toTable.getTableName());
+        return sb.toString();
     }
 
     @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-11-24 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.77.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.7.11.jar
-- classpath/embulk-output-postgresql-0.7.11.jar
-- classpath/embulk-output-redshift-0.7.11.jar
+- classpath/embulk-output-jdbc-0.7.12.jar
+- classpath/embulk-output-postgresql-0.7.12.jar
+- classpath/embulk-output-redshift-0.7.12.jar
 - classpath/embulk-util-aws-credentials-0.2.8.jar
 - classpath/httpclient-4.3.6.jar
 - classpath/httpcore-4.3.3.jar