embulk-output-postgresql 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5545d538941237db1bb7b6c3263416ec15ce226
-  data.tar.gz: 361c020e9f3503d38ce9dda883028a6a2ed06f0b
+  metadata.gz: 92ad15e7a7d79e5584efbc486e48bafe4eb2096f
+  data.tar.gz: 4c6731253c58f888fded75e7ee0588234bd7b123
 SHA512:
-  metadata.gz: c0c1d4966253a064d8317ea6181889afdad40078e7f0441f9b64c9d6fa4087c169b5f8f51a012cbb823c28d33f2110a5b7a4ffc4b42cd9d9b11837b943654541
-  data.tar.gz: fcb925f2205c60e6d3017e2af50377c49b969390a97a4533936f06b67ecd97e50a74d459335f448e0fb7265e5e94bac932539df5af419ae0d90acf16f529e0a6
+  metadata.gz: 12e94ac98087761e4c996895a01d5be30d529efc140f593823280829f1f32bc08864f4b38e1638ded04bb5d03c62e154e1e4ba0e4ba5b8756bbe46043cb5e1a2
+  data.tar.gz: da5fa17bdde718404b2331212da4c6dbffb2dc84de3f765ecc88e95a7af7e6432605eeb9f72e08012fdb1305860a20efa557b71cf875be282385e596cecfb986

data/README.md

@@ -16,6 +16,7 @@ PostgreSQL output plugin for Embulk loads records to PostgreSQL.
 - **password**: database login password (string, default: "")
 - **database**: destination database name (string, required)
 - **schema**: destination schema name (string, default: "public")
+- **temp_schema**: schema name for intermediate tables. by default, intermediate tables will be created in the schema specified by `schema`. replace mode doesn't support temp_schema. (string, optional)
 - **table**: destination table name (string, required)
 - **options**: extra connection properties (hash, default: {})
 - **retry_limit** max retry count for database operations (integer, default: 12)

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

@@ -48,6 +48,10 @@ public class PostgreSQLOutputPlugin
         @ConfigDefault("\"public\"")
         public String getSchema();
 
+        @Config("temp_schema")
+        @ConfigDefault("null")
+        public Optional<String> getTempSchema();
+
         @Config("ssl")
         @ConfigDefault("false")
         public boolean getSsl();
@@ -107,6 +111,16 @@ public class PostgreSQLOutputPlugin
         return new PostgreSQLOutputConnector(url, props, t.getSchema());
     }
 
+    @Override
+    protected TableIdentifier buildIntermediateTableId(JdbcOutputConnection con, PluginTask task, String tableName) {
+        PostgreSQLPluginTask t = (PostgreSQLPluginTask) task;
+        // replace mode doesn't support temp_schema because ALTER TABLE cannot change schema of table
+        if (t.getTempSchema().isPresent() && t.getMode() != Mode.REPLACE) {
+            return new TableIdentifier(null, t.getTempSchema().get(), tableName);
+        }
+        return super.buildIntermediateTableId(con, task, tableName);
+    }
+
     @Override
     protected BatchInsert newBatchInsert(PluginTask task, Optional<MergeConfig> mergeConfig) throws IOException, SQLException
     {

data/src/main/java/org/embulk/output/postgresql/PostgreSQLCopyBatchInsert.java

@@ -1,13 +1,15 @@
 package org.embulk.output.postgresql;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.FileInputStream;
+import java.io.IOException;
 import java.sql.SQLException;
-import org.slf4j.Logger;
-import org.postgresql.copy.CopyManager;
-import org.embulk.spi.Exec;
+
 import org.embulk.output.jdbc.JdbcSchema;
+import org.embulk.output.jdbc.TableIdentifier;
+import org.embulk.spi.Exec;
+import org.postgresql.copy.CopyManager;
+import org.slf4j.Logger;
 
 public class PostgreSQLCopyBatchInsert
         extends AbstractPostgreSQLCopyBatchInsert
@@ -27,7 +29,7 @@ public class PostgreSQLCopyBatchInsert
     }
 
     @Override
-    public void prepare(String loadTable, JdbcSchema insertSchema) throws SQLException
+    public void prepare(TableIdentifier loadTable, JdbcSchema insertSchema) throws SQLException
     {
         this.connection = connector.connect(true);
         this.copySql = connection.buildCopySql(loadTable, insertSchema);

data/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnection.java

@@ -1,16 +1,17 @@
 package org.embulk.output.postgresql;
 
-import java.util.List;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.List;
 
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcOutputConnection;
+import org.embulk.output.jdbc.JdbcSchema;
 import org.embulk.output.jdbc.MergeConfig;
+import org.embulk.output.jdbc.TableIdentifier;
 import org.postgresql.copy.CopyManager;
 import org.postgresql.core.BaseConnection;
-import org.embulk.output.jdbc.JdbcOutputConnection;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.JdbcSchema;
 
 public class PostgreSQLOutputConnection
         extends JdbcOutputConnection
@@ -24,12 +25,12 @@ public class PostgreSQLOutputConnection
         connection.setAutoCommit(autoCommit);
     }
 
-    public String buildCopySql(String toTable, JdbcSchema toTableSchema)
+    public String buildCopySql(TableIdentifier toTable, JdbcSchema toTableSchema)
     {
         StringBuilder sb = new StringBuilder();
 
         sb.append("COPY ");
-        quoteIdentifierString(sb, toTable);
+        quoteTableIdentifier(sb, toTable);
         sb.append(" (");
         for (int i = 0; i < toTableSchema.getCount(); i++) {
             if (i != 0) { sb.append(", "); }
@@ -47,7 +48,7 @@ public class PostgreSQLOutputConnection
     }
 
     @Override
-    protected String buildPreparedMergeSql(String toTable, JdbcSchema schema, MergeConfig mergeConfig) throws SQLException
+    protected String buildPreparedMergeSql(TableIdentifier toTable, JdbcSchema schema, MergeConfig mergeConfig) throws SQLException
     {
         StringBuilder sb = new StringBuilder();
 
@@ -62,7 +63,7 @@ public class PostgreSQLOutputConnection
         sb.append("),");
         sb.append("updated AS (");
         sb.append("UPDATE ");
-        quoteIdentifierString(sb, toTable);
+        quoteTableIdentifier(sb, toTable);
         sb.append(" SET ");
         if (mergeConfig.getMergeRule().isPresent()) {
             List<String> rule = mergeConfig.getMergeRule().get();
@@ -83,7 +84,7 @@ public class PostgreSQLOutputConnection
         List<String> mergeKeys = mergeConfig.getMergeKeys();
         for (int i = 0; i < mergeKeys.size(); i++) {
             if (i != 0) { sb.append(" AND "); }
-            quoteIdentifierString(sb, toTable);
+            quoteTableIdentifier(sb, toTable);
             sb.append(".");
             quoteIdentifierString(sb, mergeKeys.get(i));
             sb.append(" = ");
@@ -99,7 +100,7 @@ public class PostgreSQLOutputConnection
         sb.append(") ");
 
         sb.append("INSERT INTO ");
-        quoteIdentifierString(sb, toTable);
+        quoteTableIdentifier(sb, toTable);
         sb.append(" (");
         for (int i = 0; i < schema.getCount(); i++) {
             if (i != 0) { sb.append(", "); }
@@ -128,13 +129,13 @@ public class PostgreSQLOutputConnection
     }
 
     @Override
-    protected String buildCollectMergeSql(List<String> fromTables, JdbcSchema schema, String toTable, MergeConfig mergeConfig) throws SQLException
+    protected String buildCollectMergeSql(List<TableIdentifier> fromTables, JdbcSchema schema, TableIdentifier toTable, MergeConfig mergeConfig) throws SQLException
     {
         StringBuilder sb = new StringBuilder();
 
         sb.append("WITH updated AS (");
         sb.append("UPDATE ");
-        quoteIdentifierString(sb, toTable);
+        quoteTableIdentifier(sb, toTable);
         sb.append(" SET ");
         if (mergeConfig.getMergeRule().isPresent()) {
             List<String> rule = mergeConfig.getMergeRule().get();
@@ -163,14 +164,14 @@ public class PostgreSQLOutputConnection
                 quoteIdentifierString(sb, schema.getColumnName(j));
             }
             sb.append(" FROM ");
-            quoteIdentifierString(sb, fromTables.get(i));
+            quoteTableIdentifier(sb, fromTables.get(i));
         }
         sb.append(") S");
         sb.append(" WHERE ");
         List<String> mergeKeys = mergeConfig.getMergeKeys();
         for (int i = 0; i < mergeKeys.size(); i++) {
             if (i != 0) { sb.append(" AND "); }
-            quoteIdentifierString(sb, toTable);
+            quoteTableIdentifier(sb, toTable);
             sb.append(".");
             quoteIdentifierString(sb, mergeKeys.get(i));
             sb.append(" = ");
@@ -186,7 +187,7 @@ public class PostgreSQLOutputConnection
         sb.append(") ");
 
         sb.append("INSERT INTO ");
-        quoteIdentifierString(sb, toTable);
+        quoteTableIdentifier(sb, toTable);
         sb.append(" (");
         for (int i = 0; i < schema.getCount(); i++) {
             if (i != 0) { sb.append(", "); }
@@ -207,7 +208,7 @@ public class PostgreSQLOutputConnection
                 quoteIdentifierString(sb, schema.getColumnName(j));
             }
             sb.append(" FROM ");
-            quoteIdentifierString(sb, fromTables.get(i));
+            quoteTableIdentifier(sb, fromTables.get(i));
         }
         sb.append(") S ");
         sb.append("WHERE NOT EXISTS (");
@@ -225,7 +226,7 @@ public class PostgreSQLOutputConnection
         return sb.toString();
     }
 
-    protected void collectReplaceView(List<String> fromTables, JdbcSchema schema, String toTable) throws SQLException
+    protected void collectReplaceView(List<TableIdentifier> fromTables, JdbcSchema schema, TableIdentifier toTable) throws SQLException
     {
         Statement stmt = connection.createStatement();
         try {
@@ -266,4 +267,17 @@ public class PostgreSQLOutputConnection
         }
         return super.buildColumnTypeName(c);
     }
+
+    @Override
+    protected String buildRenameTableSql(TableIdentifier fromTable, TableIdentifier toTable)
+    {
+        // 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());
+        return sb.toString();
+    }
+
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.8.jar
-- classpath/embulk-output-postgresql-0.7.8.jar
+- classpath/embulk-output-jdbc-0.7.9.jar
+- classpath/embulk-output-postgresql-0.7.9.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/output/postgresql.rb
 - src/main/java/org/embulk/output/PostgreSQLOutputPlugin.java