embulk-output-oracle 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807550e963921329a90f3e59f3795d457fbca74d
-  data.tar.gz: 196ee9e52839d9bcaa77e6d6e8a04f7df4e3211e
+  metadata.gz: 358c95dcbfbd104bb1ce987ed429b676bf6fd651
+  data.tar.gz: f6d381125a22e04c7843cc0579bceb8b5845ba93
 SHA512:
-  metadata.gz: 75e419a9fa39ef065064e3374e883059afc55a26dc607718d6eb1c26a9152e3b69734b818897f118a291f70990751d0f76260ac3465b92a39a7e1c9d2fb4c972
-  data.tar.gz: 173329f757b809d65deb30e5111daed0f12ad90aba6a4737ff9c3e7abed2526d7d0589a665ff836fea1b53a75ec3cdafd6a04e4d9b953e59b6684ba2ba9bfb9f
+  metadata.gz: ecbcc19a7e2efc3246d1885995741a2421ce2e87b8684fe7179632cfa69611656b4c79acb351b63a9ef136b2894fe83249c1401ab6f1e6128b1a6f9a485e567b
+  data.tar.gz: 49130a08d740618752d5979a813b1d06c1b86bd680d00d36ac315c8cb44a55ac378225a0cd58b0393e71979f810184a7e34bc511d97e7d7114eccbe73d322eaa

data/README.md

@@ -31,6 +31,7 @@ Oracle output plugin for Embulk loads records to Oracle.
   - **value_type**: This plugin converts input column type (embulk type) into a database type to build a INSERT statement. This value_type option controls the type of the value in a INSERT statement. (string, default: depends on the sql type of the column. Available values options are: `byte`, `short`, `int`, `long`, `double`, `float`, `boolean`, `string`, `nstring`, `date`, `time`, `timestamp`, `decimal`, `json`, `null`, `pass`)
   - **timestamp_format**: If input column type (embulk type) is timestamp and value_type is `string` or `nstring`, this plugin needs to format the timestamp value into a string. This timestamp_format option is used to control the format of the timestamp. (string, default: `%Y-%m-%d %H:%M:%S.%6N`)
   - **timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp value into a SQL string. In this cases, this timezone option is used to control the timezone. (string, value of default_timezone option is used by default)
+- **after_load**: if set, this SQL will be executed after loading all records.
 
 ### Modes
 

data/src/main/java/org/embulk/output/oracle/oci/OCI.java

@@ -10,6 +10,7 @@ import jnr.ffi.types.u_int8_t;
 public interface OCI
 {
     static short OCI_SUCCESS = 0;
+    static short OCI_SUCCESS_WITH_INFO = 1;
     static short OCI_ERROR = -1;
     static short OCI_INVALID_HANDLE = -2;
     static short OCI_NO_DATA = 100;

data/src/main/java/org/embulk/output/oracle/oci/OCIWrapper.java

@@ -529,18 +529,30 @@ public class OCIWrapper
             case OCI.OCI_SUCCESS:
                 break;
 
+            case OCI.OCI_SUCCESS_WITH_INFO:
+                if (errHandle != null) {
+                    ArrayMemoryIO errrCode = new ArrayMemoryIO(Runtime.getSystemRuntime(), 4);
+                    ArrayMemoryIO buffer = new ArrayMemoryIO(Runtime.getSystemRuntime(), 512);
+                    if (oci.OCIErrorGet(errHandle, 1, null, errrCode, buffer, (int)buffer.size(), OCI.OCI_HTYPE_ERROR) == OCI.OCI_SUCCESS) {
+                        String message = new String(buffer.array(), systemCharset);
+                        logger.warn(message);
+                    }
+                }
+                break;
+
             case OCI.OCI_ERROR:
                 if (errHandle == null) {
                     throwException("OCI : %s failed : %d.", operation, result);
-                }
-                ArrayMemoryIO errrCode = new ArrayMemoryIO(Runtime.getSystemRuntime(), 4);
-                ArrayMemoryIO buffer = new ArrayMemoryIO(Runtime.getSystemRuntime(), 512);
-                if (oci.OCIErrorGet(errHandle, 1, null, errrCode, buffer, (int)buffer.size(), OCI.OCI_HTYPE_ERROR) != OCI.OCI_SUCCESS) {
-                    throwException("OCI : %s failed : %d. OCIErrorGet failed.", operation, result);
-                }
+                } else {
+                    ArrayMemoryIO errrCode = new ArrayMemoryIO(Runtime.getSystemRuntime(), 4);
+                    ArrayMemoryIO buffer = new ArrayMemoryIO(Runtime.getSystemRuntime(), 512);
+                    if (oci.OCIErrorGet(errHandle, 1, null, errrCode, buffer, (int)buffer.size(), OCI.OCI_HTYPE_ERROR) != OCI.OCI_SUCCESS) {
+                        throwException("OCI : %s failed : %d. OCIErrorGet failed.", operation, result);
+                    }
 
-                String message = new String(buffer.array(), systemCharset);
-                throwException("OCI : %s failed : %d. %s", operation, result, message);
+                    String message = new String(buffer.array(), systemCharset);
+                    throwException("OCI : %s failed : %d. %s", operation, result, message);
+                }
 
             case OCI.OCI_INVALID_HANDLE:
                 throwException("OCI : %s failed : invalid handle.", operation);

data/src/test/java/org/embulk/output/oracle/OracleOutputPluginTest.java

@@ -45,7 +45,7 @@ public class OracleOutputPluginTest extends AbstractJdbcOutputPluginTest
         try {
             Class.forName("oracle.jdbc.OracleDriver");
         } catch (ClassNotFoundException | NoClassDefFoundError e) {
-            System.err.println("Warning: you should put 'ojdbc7.jar' in 'embulk-input-oracle/driver' directory in order to test.");
+            System.err.println("Warning: you should put 'ojdbc7.jar' in 'embulk-output-oracle/driver' directory in order to test.");
             return;
         }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-25 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.0.jar
-- classpath/embulk-output-oracle-0.7.0.jar
+- classpath/embulk-output-jdbc-0.7.1.jar
+- classpath/embulk-output-oracle-0.7.1.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