embulk-input-sqlserver 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a28bc0a24889fb4b87c8ce28838c6ed3a85bad7
-  data.tar.gz: 25afe54eb3dab0944c644fbc53fdf4325ee1a28d
+  metadata.gz: c16ee19779397cd99053ee70ba2f598f3a325bf8
+  data.tar.gz: c47ff7d2bd88a005e388155922ebf564061c9e00
 SHA512:
-  metadata.gz: 4550243e5b325368420f04798f53281f18facf4f083088e14e8b5ac7c8fe502593ef2ff5cfc75e973e9f29dfd0817a2f2685d3a6c289070afb19e3afc0b511ba
-  data.tar.gz: a00150591fd92378df2ef32900f5b6fda039c46ec60793158dd2d2e62232c540f21f1e89cdb731d301ec34ca3a8adbaf1aacf59dd4de2f7ebada70f94571dfa8
+  metadata.gz: 75539ff9386b73939da535ce0e771447150e760e2f625349202173af75d981497ca923297724352540a3effe9ae6cb675bab72263cb246cf64d13ea56861e7e2
+  data.tar.gz: 9cf2395a6589ac9b03696f5170766601ce7cd50bb481cb171b0264d83d033fbb8efd3a4ecb5ae52b1c4fa993f5f36d440f4be4cbc9c1c713680b74f44dcacf0e

data/README.md

@@ -27,6 +27,7 @@ embulk "-J-Djava.library.path=C:\drivers" run input-sqlserver.yml
   - **query**: SQL to run (string)
 - If **query** is not set,
   - **table**: destination table name (string, required)
+  - **transaction_isolation_level**: transaction isolation level (e.g. `NOLOCK`). The value is used as table hint (e.g. `SELECT * FROM SOME_TABLE with (NOLOCK)`). (string, optional)
   - **select**: expression of select (e.g. `id, created_at`) (string, default: "*")
   - **where**: WHERE condition to filter the rows (string, default: no-condition)
   - **order_by**: expression of ORDER BY to sort rows (e.g. `created_at DESC, id ASC`) (string, default: not sorted)

data/src/main/java/org/embulk/input/SQLServerInputPlugin.java

@@ -11,9 +11,14 @@ import org.embulk.config.ConfigDefault;
 import org.embulk.config.ConfigException;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
 import org.embulk.input.jdbc.JdbcInputConnection;
+import org.embulk.input.jdbc.getter.ColumnGetterFactory;
 import org.embulk.input.sqlserver.SQLServerInputConnection;
 
 import com.google.common.base.Optional;
+import org.embulk.input.sqlserver.getter.SQLServerColumnGetterFactory;
+import org.embulk.spi.PageBuilder;
+import org.joda.time.DateTimeZone;
+
 import static java.util.Locale.ENGLISH;
 
 public class SQLServerInputPlugin
@@ -64,6 +69,10 @@ public class SQLServerInputPlugin
         @ConfigDefault("null")
         public Optional<String> getSchema();
 
+        @Config("transaction_isolation_level")
+        @ConfigDefault("null")
+        public Optional<String> getTransactionIsolationLevel();
+
         @Config("application_name")
         @ConfigDefault("\"embulk-input-sqlserver\"")
         @Size(max=128)
@@ -134,7 +143,8 @@ public class SQLServerInputPlugin
 
         Connection con = driver.connect(urlAndProps.getUrl(), props);
         try {
-            SQLServerInputConnection c = new SQLServerInputConnection(con, sqlServerTask.getSchema().orNull());
+            SQLServerInputConnection c = new SQLServerInputConnection(con, sqlServerTask.getSchema().orNull(),
+                                                                      sqlServerTask.getTransactionIsolationLevel().orNull());
             con = null;
             return c;
         }
@@ -145,6 +155,12 @@ public class SQLServerInputPlugin
         }
     }
 
+    @Override
+    protected ColumnGetterFactory newColumnGetterFactory(PageBuilder pageBuilder, DateTimeZone dateTimeZone)
+    {
+        return new SQLServerColumnGetterFactory(pageBuilder, dateTimeZone);
+    }
+
     private UrlAndProperties buildUrlAndProperties(SQLServerPluginTask sqlServerTask, boolean useJtdsDriver)
     {
         Properties props = new Properties();

data/src/main/java/org/embulk/input/sqlserver/SQLServerInputConnection.java

@@ -6,11 +6,20 @@ import org.embulk.input.jdbc.JdbcInputConnection;
 
 public class SQLServerInputConnection extends JdbcInputConnection {
 
+    private String transactionIsolationLevel;
+
     public SQLServerInputConnection(Connection connection, String schemaName) throws SQLException
     {
         super(connection, schemaName);
     }
 
+    public SQLServerInputConnection(Connection connection, String schemaName, String transactionIsolationLevel)
+            throws SQLException
+    {
+        super(connection, schemaName);
+        this.transactionIsolationLevel = transactionIsolationLevel;
+    }
+
     @Override
     protected void setSearchPath(String schema) throws SQLException
     {
@@ -25,6 +34,9 @@ public class SQLServerInputConnection extends JdbcInputConnection {
             sb.append(quoteIdentifierString(schemaName)).append(".");
         }
         sb.append(quoteIdentifierString(tableName));
+        if (transactionIsolationLevel != null) {
+            sb.append(" with (" + transactionIsolationLevel + ")");
+        }
         return sb.toString();
     }
 

data/src/main/java/org/embulk/input/sqlserver/getter/SQLServerColumnGetterFactory.java

@@ -0,0 +1,30 @@
+package org.embulk.input.sqlserver.getter;
+
+import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
+import org.embulk.input.jdbc.JdbcColumn;
+import org.embulk.input.jdbc.JdbcColumnOption;
+import org.embulk.input.jdbc.JdbcInputConnection;
+import org.embulk.input.jdbc.getter.*;
+import org.embulk.spi.PageBuilder;
+import org.joda.time.DateTimeZone;
+
+public class SQLServerColumnGetterFactory extends ColumnGetterFactory {
+
+    public SQLServerColumnGetterFactory(PageBuilder to, DateTimeZone defaultTimeZone)
+    {
+        super(to, defaultTimeZone);
+    }
+
+    @Override
+    public ColumnGetter newColumnGetter(JdbcInputConnection con, AbstractJdbcInputPlugin.PluginTask task, JdbcColumn column, JdbcColumnOption option)
+    {
+        ColumnGetter getter = super.newColumnGetter(con, task, column, option);
+        switch (column.getTypeName()) {
+            case "datetime":
+                return new TimestampWithoutTimeZoneIncrementalHandler(getter);
+            default:
+                return getter;
+        }
+    }
+
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sqlserver
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,12 +19,13 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.9.1.jar
-- classpath/embulk-input-sqlserver-0.9.1.jar
+- classpath/embulk-input-jdbc-0.9.2.jar
+- classpath/embulk-input-sqlserver-0.9.2.jar
 - classpath/jtds-1.3.1.jar
 - lib/embulk/input/sqlserver.rb
 - src/main/java/org/embulk/input/SQLServerInputPlugin.java
 - src/main/java/org/embulk/input/sqlserver/SQLServerInputConnection.java
+- src/main/java/org/embulk/input/sqlserver/getter/SQLServerColumnGetterFactory.java
 - src/test/java/org/embulk/input/sqlserver/BasicTest.java
 - src/test/java/org/embulk/input/sqlserver/SQLServerTests.java
 - src/test/resources/org/embulk/input/sqlserver/test/expect/basic/setup.sql