embulk-output-sqlserver 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 786d49060396376e68bd28cf4e69a374cb9d30e2
-  data.tar.gz: 9dd2c4b622a916271a964b3d042efce2de4cdfe1
+  metadata.gz: 760819b9d6fa3e94d1719d1730e4b5b7564b6134
+  data.tar.gz: 2867fe096261c86be930712a61becaa633bf30ac
 SHA512:
-  metadata.gz: 4b193c07d2db4dc3b56e8ea55c2204766543ec557ca147db3b8e13bd232eb7889913cc744bc511af9127008be3e7f18e6bc890a47eeaddd9861684b41bbf312b
-  data.tar.gz: 81e500f5d37ea191468130718abb6a75a70d7ea21dcb97721c6b853c2bf35e4e4d83f32fa9a7903f75ddee96d72cdffd71a5326d91b9eede5c07036f2671e488
+  metadata.gz: b40606a2db66bd7725dee518ff2d69041cccc59ddf3d0125d854060d49aab17e9db19d1192b8d6731092e3a6f49181e3f503cf5d3934d38ebccb8898e960d95d
+  data.tar.gz: c7f7bad7eddc9fafbdfa0e37bca3f4dfcf24d65eec2ebf19b1d9b277f60c9328492897fb0da07d6f06d9f1098f7df55498fc8b8943968909dfb227113c24e221

data/README.md

@@ -22,6 +22,8 @@ embulk "-J-Djava.library.path=C:\drivers" run input-sqlserver.yml
 - **password**: database login password (string, default: "")
 - **instance**: destination instance name (string, default: use the default instance)
 - **database**: destination database name (string, default: use the default database)
+- **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. (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/SQLServerOutputPlugin.java

@@ -8,8 +8,10 @@ import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigException;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
 import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.output.jdbc.JdbcOutputConnection;
 import org.embulk.output.jdbc.MergeConfig;
 import org.embulk.output.jdbc.StandardBatchInsert;
+import org.embulk.output.jdbc.TableIdentifier;
 import org.embulk.output.jdbc.setter.ColumnSetterFactory;
 import org.embulk.output.sqlserver.InsertMethod;
 import org.embulk.output.sqlserver.NativeBatchInsert;
@@ -67,6 +69,14 @@ public class SQLServerOutputPlugin
         @ConfigDefault("\"\"")
         public Optional<String> getPassword();
 
+        @Config("schema")
+        @ConfigDefault("null")
+        public Optional<String> getSchema();
+
+        @Config("temp_schema")
+        @ConfigDefault("null")
+        public Optional<String> getTempSchema();
+
         @Config("insert_method")
         @ConfigDefault("\"normal\"")
         public InsertMethod getInsertMethod();
@@ -139,7 +149,7 @@ public class SQLServerOutputPlugin
 
         UrlAndProperties urlProps = getUrlAndProperties(sqlServerTask, useJtdsDriver);
         logger.info("Connecting to {} options {}", urlProps.getUrl(), getPropsWithMaskedSecret(urlProps));
-        return new SQLServerOutputConnector(urlProps.getUrl(), urlProps.getProps(), null);
+        return new SQLServerOutputConnector(urlProps.getUrl(), urlProps.getProps(), sqlServerTask.getSchema().orNull());
     }
 
     private UrlAndProperties getUrlAndProperties(SQLServerPluginTask sqlServerTask, boolean useJtdsDriver)
@@ -231,6 +241,15 @@ public class SQLServerOutputPlugin
         return new UrlAndProperties(url, props);
     }
 
+    @Override
+    protected TableIdentifier buildIntermediateTableId(JdbcOutputConnection con, PluginTask task, String tableName) {
+        SQLServerPluginTask sqlServerTask = (SQLServerPluginTask) task;
+        // replace mode doesn't support temp_schema because sp_rename cannot change schema of table
+        if (sqlServerTask.getTempSchema().isPresent() && sqlServerTask.getMode() != Mode.REPLACE) {
+            return new TableIdentifier(null, sqlServerTask.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/sqlserver/NativeBatchInsert.java

@@ -12,6 +12,7 @@ import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.JdbcSchema;
 import org.embulk.output.jdbc.StandardBatchInsert;
+import org.embulk.output.jdbc.TableIdentifier;
 import org.embulk.output.jdbc.TimestampFormat;
 import org.embulk.output.sqlserver.nativeclient.NativeClientWrapper;
 import org.embulk.spi.Exec;
@@ -58,10 +59,10 @@ public class NativeBatchInsert implements BatchInsert
 
 
     @Override
-    public void prepare(String loadTable, JdbcSchema insertSchema) throws SQLException
+    public void prepare(TableIdentifier loadTable, JdbcSchema insertSchema) throws SQLException
     {
         columnCount = insertSchema.getCount();
-        client.open(server, port, instance, database, user, password, loadTable);
+        client.open(server, port, instance, database, user, password, loadTable.getTableName());
 
         formats = new DateFormat[insertSchema.getCount()];
         for (int i = 0; i < insertSchema.getCount(); i++) {

data/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnection.java

@@ -10,6 +10,7 @@ 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 SQLServerOutputConnection
         extends JdbcOutputConnection
@@ -22,13 +23,18 @@ public class SQLServerOutputConnection
     }
 
     @Override
-    protected String buildRenameTableSql(String fromTable, String toTable)
+    protected String buildRenameTableSql(TableIdentifier fromTable, TableIdentifier toTable)
     {
+        // sp_rename cannot change schema of table
         StringBuilder sb = new StringBuilder();
         sb.append("EXEC sp_rename ");
-        sb.append(quoteIdentifierString(fromTable));
+        if (fromTable.getSchemaName() == null) {
+            sb.append(quoteIdentifierString(fromTable.getTableName()));
+        } else {
+            sb.append(quoteIdentifierString(fromTable.getSchemaName() + "." + fromTable.getTableName()));
+        }
         sb.append(", ");
-        sb.append(quoteIdentifierString(toTable));
+        sb.append(quoteIdentifierString(toTable.getTableName()));
         sb.append(", 'OBJECT'");
         return sb.toString();
     }
@@ -55,53 +61,29 @@ public class SQLServerOutputConnection
     }
 
     @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
+    protected void dropTableIfExists(Statement stmt, TableIdentifier table) throws SQLException
     {
-        if (tableExists(tableName)) {
-            dropTable(stmt, tableName);
+        if (tableExists(table)) {
+            dropTable(stmt, table);
         }
     }
 
     @Override
-    public void createTableIfNotExists(String tableName, JdbcSchema schema) throws SQLException
-    {
-        if (!tableExists(tableName)) {
-            createTable(tableName, schema);
-        }
-    }
-
-    public void createTable(String tableName, JdbcSchema schema) throws SQLException
+    public void createTableIfNotExists(TableIdentifier table, 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();
+        if (!tableExists(table)) {
+            createTable(table, schema);
         }
     }
 
-    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 final String[] SIMPLE_TYPE_NAMES = {
         "BIT", "FLOAT",
     };
@@ -116,12 +98,12 @@ public class SQLServerOutputConnection
     }
 
     @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(" AS T");
         sb.append(" USING (");
         for (int i = 0; i < fromTables.size(); i++) {
@@ -129,7 +111,7 @@ public class SQLServerOutputConnection
             sb.append(" SELECT ");
             sb.append(buildColumns(schema, ""));
             sb.append(" FROM ");
-            sb.append(quoteIdentifierString(fromTables.get(i)));
+            sb.append(quoteTableIdentifier(fromTables.get(i)));
         }
         sb.append(") AS S");
         sb.append(" ON (");

data/src/main/java/org/embulk/output/sqlserver/SQLServerOutputConnector.java

@@ -1,15 +1,22 @@
 package org.embulk.output.sqlserver;
 
-import org.embulk.output.jdbc.JdbcOutputConnector;
-
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import org.embulk.output.jdbc.JdbcOutputConnector;
+import org.embulk.spi.Exec;
+import org.slf4j.Logger;
+
+
 public class SQLServerOutputConnector
         implements JdbcOutputConnector
 {
+    private final Logger logger = Exec.getLogger(getClass());
+
     private final String url;
     private final Properties properties;
     private final String schemaName;
@@ -30,6 +37,23 @@ public class SQLServerOutputConnector
             throw new SQLException("Invalid url : " + url);
         }
 
+        String schemaName = this.schemaName;
+        if (schemaName == null) {
+            // get default schema name for user (Connection#getSchema won't work)
+            try {
+                try (PreparedStatement statement = c.prepareStatement("SELECT default_schema_name FROM sys.database_principals WHERE name = ?")) {
+                    statement.setString(1, properties.getProperty("user"));
+                    try (ResultSet rs = statement.executeQuery()) {
+                        if (rs.next()) {
+                            schemaName = rs.getString(1);
+                        }
+                    }
+                }
+            } catch (SQLException e) {
+                logger.warn("Cannot specify default schema : " + e);
+            }
+        }
+
         try {
             SQLServerOutputConnection con = new SQLServerOutputConnection(c, schemaName, autoCommit);
             c = null;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sqlserver
 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-sqlserver-0.7.8.jar
+- classpath/embulk-output-jdbc-0.7.9.jar
+- classpath/embulk-output-sqlserver-0.7.9.jar
 - classpath/jtds-1.3.1.jar
 - lib/embulk/output/sqlserver.rb
 - src/main/java/org/embulk/output/SQLServerOutputPlugin.java