embulk-output-oracle 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c509090502c865c3379b81256eafb46d1b646723
-  data.tar.gz: 9fdd4a4246876a4cc163e6e7cbee46a81b1e46ed
+  metadata.gz: ca1526b2ef4b47df791546e857435f62a4cd24c2
+  data.tar.gz: dda1b751b35040326ecd19a054ed9ebc8a90d20c
 SHA512:
-  metadata.gz: 0d6068d31a3a189ae7b2958e3dd54926e7c5544c4267bbe5b9b5dc7a988729a2e3024f21015a3b1c617320ca760e6764f6d1ca5a1664059f10e0a714ecc6545f
-  data.tar.gz: fbdb957bf2461d3d31e5b4d712c53f8a06f802eebf122dd7c7b884c50eb515daf7d8c26ab8ff3cec907255fbb867f3c8d4e932e741094738086051a97632a6c3
+  metadata.gz: 5f309bc65a52b1848e9684900a82804107387f35b2070cfb54b8a72f3d9db9c8233e8da1e962574ac5f4b8f3042df0e03b7ec28af096607f649c2c6b0be35ed8
+  data.tar.gz: b9e324bb613f72f91139beb146f94db2eb8b7699398767fe160b476c38bb6420e2c496abb0cae43f105fbd4507e886c2f73cedab2a0c2f3c3b2d9b6736a403ea

data/README.md

@@ -16,6 +16,8 @@ Oracle output plugin for Embulk loads records to Oracle.
 - **user**: database login user name (string, required)
 - **password**: database login password (string, default: "")
 - **database**: destination database name (string, required if url is not set or insert_method is "oci")
+- **schema** destination schema name (string, optional)
+- **temp_schema**: schema name for intermediate tables. by default, intermediate tables will be created in the same schema as destination table. replace mode doesn't support temp_schema. (string, optional)
 - **url**: URL of the JDBC connection (string, optional)
 - **table**: destination table name (string, required)
 - **options**: extra connection properties (hash, default: {})

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

@@ -42,6 +42,10 @@ public class OracleOutputPlugin
         @ConfigDefault("null")
         public Optional<String> getSchema();
 
+        @Config("temp_schema")
+        @ConfigDefault("null")
+        public Optional<String> getTempSchema();
+
         @Config("url")
         @ConfigDefault("null")
         public Optional<String> getUrl();
@@ -122,6 +126,16 @@ public class OracleOutputPlugin
         return new OracleOutputConnector(url, props, oracleTask.getSchema().orNull(), oracleTask.getInsertMethod() == InsertMethod.direct);
     }
 
+    @Override
+    protected TableIdentifier buildIntermediateTableId(JdbcOutputConnection con, PluginTask task, String tableName) {
+        OraclePluginTask oracleTask = (OraclePluginTask) task;
+        // replace mode doesn't support temp_schema because ALTER TABLE doesn't support schema.
+        if (oracleTask.getTempSchema().isPresent() && oracleTask.getMode() != Mode.REPLACE) {
+            return new TableIdentifier(null, oracleTask.getTempSchema().get(), tableName);
+        }
+        return super.buildIntermediateTableId(con, task, tableName);
+    }
+
     @Override
     protected BatchInsert newBatchInsert(PluginTask task, Optional<MergeConfig> mergeConfig) throws IOException, SQLException
     {
@@ -144,7 +158,6 @@ public class OracleOutputPlugin
                     String.format("%s:%d/%s", oracleTask.getHost().get(), oracleTask.getPort(), oracleTask.getDatabase().get()),
                     oracleTask.getUser(),
                     oracleTask.getPassword(),
-                    oracleTask.getSchema().orNull(),
                     charset,
                     nationalCharset,
                     oracleTask.getBatchSize());

data/src/main/java/org/embulk/output/oracle/DirectBatchInsert.java

@@ -14,6 +14,7 @@ import java.util.List;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.JdbcSchema;
+import org.embulk.output.jdbc.TableIdentifier;
 import org.embulk.output.jdbc.TimestampFormat;
 import org.embulk.output.oracle.oci.ColumnDefinition;
 import org.embulk.output.oracle.oci.OCI;
@@ -31,7 +32,6 @@ public class DirectBatchInsert implements BatchInsert
     private final String database;
     private final String user;
     private final String password;
-    private final String schema;
     private final OracleCharset charset;
     private final OracleCharset nationalCharset;
     private final int batchSize;
@@ -41,20 +41,19 @@ public class DirectBatchInsert implements BatchInsert
     private DateFormat[] formats;
 
 
-    public DirectBatchInsert(String database, String user, String password, String schema,
+    public DirectBatchInsert(String database, String user, String password,
             OracleCharset charset, OracleCharset nationalCharset, int batchSize)
     {
         this.database = database;
         this.user = user;
         this.password = password;
-        this.schema = schema;
         this.charset = charset;
         this.nationalCharset = nationalCharset;
         this.batchSize = batchSize;
     }
 
     @Override
-    public void prepare(String loadTable, JdbcSchema insertSchema) throws SQLException
+    public void prepare(TableIdentifier loadTable, JdbcSchema insertSchema) throws SQLException
     {
 
         /*
@@ -141,8 +140,8 @@ public class DirectBatchInsert implements BatchInsert
 
         }
 
-        TableDefinition tableDefinition = new TableDefinition(schema, loadTable, columns);
-        ociKey = Arrays.asList(database, user, loadTable);
+        TableDefinition tableDefinition = new TableDefinition(loadTable.getSchemaName(), loadTable.getTableName(), columns);
+        ociKey = Arrays.asList(database, user, loadTable.getTableName());
         OCIWrapper oci = ociManager.open(ociKey, database, user, password, tableDefinition, batchSize);
 
         buffer = new RowBuffer(oci, tableDefinition);

data/src/main/java/org/embulk/output/oracle/OracleOutputConnection.java

@@ -11,10 +11,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.embulk.output.jdbc.JdbcOutputConnection;
 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;
 
 public class OracleOutputConnection
         extends JdbcOutputConnection
@@ -63,52 +64,28 @@ public class OracleOutputConnection
     }
 
     @Override
-    public void dropTableIfExists(String tableName) throws SQLException
+    public void dropTableIfExists(TableIdentifier table) throws SQLException
     {
-        if (tableExists(tableName)) {
-            dropTable(tableName);
+        if (tableExists(table)) {
+            dropTable(table);
         }
     }
 
     @Override
-    protected void dropTableIfExists(Statement stmt, String tableName) throws SQLException {
-        if (tableExists(tableName)) {
-            dropTable(stmt, tableName);
+    protected void dropTableIfExists(Statement stmt, TableIdentifier table) throws SQLException {
+        if (tableExists(table)) {
+            dropTable(stmt, table);
         }
     }
 
     @Override
-    public void createTableIfNotExists(String tableName, JdbcSchema schema) throws SQLException
+    public void createTableIfNotExists(TableIdentifier table, JdbcSchema schema) throws SQLException
     {
-        if (!tableExists(tableName)) {
-            createTable(tableName, schema);
+        if (!tableExists(table)) {
+            createTable(table, schema);
         }
     }
 
-    public void createTable(String tableName, JdbcSchema schema) throws SQLException
-    {
-        Statement stmt = connection.createStatement();
-        try {
-            String sql = buildCreateTableSql(tableName, schema);
-            executeUpdate(stmt, sql);
-            commitIfNecessary(connection);
-        } catch (SQLException ex) {
-            throw safeRollback(connection, ex);
-        } finally {
-            stmt.close();
-        }
-    }
-
-    protected String buildCreateTableSql(String name, JdbcSchema schema)
-    {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("CREATE TABLE ");
-        quoteIdentifierString(sb, name);
-        sb.append(buildCreateTableSchemaSql(schema));
-        return sb.toString();
-    }
-
     private static String getSchema(Connection connection) throws SQLException
     {
         // Because old Oracle JDBC drivers don't support Connection#getSchema method.
@@ -124,7 +101,19 @@ public class OracleOutputConnection
     }
 
     @Override
-    protected String buildPreparedInsertSql(String toTable, JdbcSchema toTableSchema) throws SQLException
+    protected String buildRenameTableSql(TableIdentifier fromTable, TableIdentifier toTable)
+    {
+        // ALTER TABLE doesn't support schema
+        StringBuilder sb = new StringBuilder();
+        sb.append("ALTER TABLE ");
+        quoteIdentifierString(sb, fromTable.getTableName());
+        sb.append(" RENAME TO ");
+        quoteIdentifierString(sb, toTable.getTableName());
+        return sb.toString();
+    }
+
+    @Override
+    protected String buildPreparedInsertSql(TableIdentifier toTable, JdbcSchema toTableSchema) throws SQLException
     {
         String sql = super.buildPreparedInsertSql(toTable, toTableSchema);
         if (direct) {
@@ -199,12 +188,12 @@ public class OracleOutputConnection
     }
 
     @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("MERGE INTO ");
-        sb.append(quoteIdentifierString(toTable));
+        sb.append(quoteTableIdentifier(toTable));
         sb.append(" T");
         sb.append(" USING (");
         for (int i = 0; i < fromTables.size(); i++) {
@@ -212,7 +201,7 @@ public class OracleOutputConnection
             sb.append(" SELECT ");
             sb.append(buildColumns(schema, ""));
             sb.append(" FROM ");
-            sb.append(quoteIdentifierString(fromTables.get(i)));
+            sb.append(quoteTableIdentifier(fromTables.get(i)));
         }
         sb.append(") S");
         sb.append(" ON (");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 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-oracle-0.7.8.jar
+- classpath/embulk-output-jdbc-0.7.9.jar
+- classpath/embulk-output-oracle-0.7.9.jar
 - lib/embulk/native/x86_64-linux/libembulk-output-oracle-oci.so
 - lib/embulk/native/x86_64-windows/embulk-output-oracle-oci.dll
 - lib/embulk/output/oracle.rb