embulk-input-oracle 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa381d190b65904b3393967e047467972a826f4
-  data.tar.gz: f77b70585994e6b192c0ab803def3a5eba4a7029
+  metadata.gz: 6b2a3b361655d84baa4f070934441854322eae73
+  data.tar.gz: b32e4d1d7f217981af117e5139fcbc83a374a7e7
 SHA512:
-  metadata.gz: d6e9f34bf9e431ad011f2e474c466f2add3ad4044c2c9d7e99cd11baa3f130b9846326ecf59907cbf3e021be83b13a5828918c99ac8671562fe865d42c12604b
-  data.tar.gz: 859e82a91aaee603bf109685c9e5d5abc92568a05ff2a5cae89bfea950ae6b673ee4140990841015b1223d4ac5635f63dea8e27affbdebc55f2e5ee60a77964a
+  metadata.gz: 30911500bde0d44e415ab5c483875cc23f034d0893bc8cfbffd91266c59df5e01b66a55fbb48d362301bc6c281b0fd4b69c092e51c68fa9d99ee9f5260ca91e4
+  data.tar.gz: 7a37fd58d8555b1175fddd1173b621acb6c8e89a977812cfd960d9e551d7714902324a5810c991d9bcf3c015e7e49cc391cbfa8c8c2b2142016fd33fcdb919f0

data/README.md

@@ -67,7 +67,7 @@ At the next execution, when `last_record: ` is also set, this plugin generates a
 SELECT * FROM (
   ...original query is here...
 )
-WHERE created_at > '2017-01-01 00:32:12' OR (created_at = '2017-01-01 00:32:12' AND id > 5291)
+WHERE updated_at > '2017-01-01 00:32:12' OR (updated_at = '2017-01-01 00:32:12' AND id > 5291)
 ORDER BY updated_at, id
 ```
 

data/src/main/java/org/embulk/input/oracle/OracleInputConnection.java

@@ -1,7 +1,9 @@
 package org.embulk.input.oracle;
 
 import java.sql.Connection;
+import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 
 import org.embulk.input.jdbc.JdbcInputConnection;
 
@@ -9,7 +11,7 @@ public class OracleInputConnection extends JdbcInputConnection {
 
     public OracleInputConnection(Connection connection, String schemaName) throws SQLException
     {
-        super(connection, schemaName);
+        super(connection, schemaName == null ? getSchema(connection) : schemaName);
     }
 
     @Override
@@ -18,4 +20,18 @@ public class OracleInputConnection extends JdbcInputConnection {
         connection.setSchema(schema);
     }
 
+    private static String getSchema(Connection connection) throws SQLException
+    {
+        // Because old Oracle JDBC drivers don't support Connection#getSchema method.
+        String sql = "SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL";
+        try (Statement statement = connection.createStatement()) {
+            try (ResultSet resultSet = statement.executeQuery(sql)) {
+                if (resultSet.next()) {
+                    return resultSet.getString(1);
+                }
+                throw new SQLException(String.format("Cannot get schema becase \"%s\" didn't return any value.", sql));
+            }
+        }
+    }
+
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-oracle
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.5.jar
-- classpath/embulk-input-oracle-0.8.5.jar
+- classpath/embulk-input-jdbc-0.8.6.jar
+- classpath/embulk-input-oracle-0.8.6.jar
 - lib/embulk/input/oracle.rb
 - src/main/java/org/embulk/input/OracleInputPlugin.java
 - src/main/java/org/embulk/input/oracle/OracleInputConnection.java