embulk-output-oracle 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1d28f36dd963700598d5e2e9db74b33e3228c59
-  data.tar.gz: ca497010b7149986e179b302532d14cf08fcaf53
+  metadata.gz: 4c80319aa49fcd2a1887d1e8ceb3d6bce058f5a3
+  data.tar.gz: a8c5d2cbe6cb8af65be5d0a33834f1807cd241db
 SHA512:
-  metadata.gz: 4b39a9146122ea3b3b178efe4a22a576b9afdeab1d03f42c273372ffb4181763fbce6b5a6689eef3058064bafd2422980338f9b284dd6415fe48bb7ec6c5bb45
-  data.tar.gz: 5a381e830a0acd21459e4086de1b876ea06c07331a6a6821bcc1ed0d11c518db92499c3389b39b15e4ff054b1664c66724694c822e9dde0ecc1d8068b5660629
+  metadata.gz: 93e147585a62ba7851725283165fb96eb3be74913b585e8245c629d3247b6fb34d9cc41b41ece68ab7089ec3e3de728943341cc419b288ceb56ec6116d8559e1
+  data.tar.gz: db9c730a1f0e68b4a911ffc1a185e36e761b71e7e46f99ba5566c9d54e28ab9d0a46267ebcc6b1a3abf414922a70baf8e2a14a7d4ca6b9c2941e4f557de20320

data/README.md

@@ -20,6 +20,8 @@ Oracle output plugin for Embulk loads records to Oracle.
 - **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)
+- **create_table_constraint** table constraint added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
+- **create_table_option** table option added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
 - **options**: extra connection properties (hash, default: {})
 - **retry_limit** max retry count for database operations (integer, default: 12)
 - **retry_wait** initial retry wait time in milliseconds (integer, default: 1000 (1 second))

data/build.gradle

@@ -3,5 +3,5 @@ dependencies {
 
     testCompile 'org.embulk:embulk-standards:0.8.22'
     testCompile project(':embulk-output-jdbc').sourceSets.test.output
-    testCompile files('driver/ojdbc7.jar')
+    testCompile files('test_jdbc_driver/ojdbc7.jar')
 }

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

@@ -83,7 +83,7 @@ public class OracleOutputPlugin
         OraclePluginTask oracleTask = (OraclePluginTask) task;
 
         if (oracleTask.getDriverPath().isPresent()) {
-            loadDriverJar(oracleTask.getDriverPath().get());
+            addDriverJarToClasspath(oracleTask.getDriverPath().get());
         }
 
         String url;

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

@@ -64,26 +64,9 @@ public class OracleOutputConnection
     }
 
     @Override
-    public void dropTableIfExists(TableIdentifier table) throws SQLException
+    protected boolean supportsTableIfExistsClause()
     {
-        if (tableExists(table)) {
-            dropTable(table);
-        }
-    }
-
-    @Override
-    protected void dropTableIfExists(Statement stmt, TableIdentifier table) throws SQLException {
-        if (tableExists(table)) {
-            dropTable(stmt, table);
-        }
-    }
-
-    @Override
-    public void createTableIfNotExists(TableIdentifier table, JdbcSchema schema) throws SQLException
-    {
-        if (!tableExists(table)) {
-            createTable(table, schema);
-        }
+        return false;
     }
 
     private static String getSchema(Connection connection) throws SQLException

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

@@ -1,9 +1,6 @@
 package org.embulk.output.oracle.oci;
 
 import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.sql.SQLException;
@@ -15,14 +12,13 @@ import jnr.ffi.Runtime;
 import jnr.ffi.provider.jffi.ArrayMemoryIO;
 import jnr.ffi.provider.jffi.ByteBufferMemoryIO;
 
+import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
 import org.embulk.spi.Exec;
 import org.slf4j.Logger;
 
 
 public class OCIWrapper
 {
-    private static final String PLUGIN_NAME = "embulk-output-oracle";
-
     private static OCI oci;
     private static BulkOCI bulkOci;
 
@@ -88,7 +84,7 @@ public class OCIWrapper
 
         Platform platform = Platform.getNativePlatform();
 
-        File folder = getPluginRoot();
+        File folder = AbstractJdbcOutputPlugin.findPluginRoot(getClass());
         folder = new File(new File(new File(new File(folder ,"lib"), "embulk"), "native"), platform.getName());
 
         File file = new File(folder, System.mapLibraryName(libraryName));
@@ -101,30 +97,6 @@ public class OCIWrapper
         return LibraryLoader.create(BulkOCI.class).search(folder.getAbsolutePath()).failImmediately().load(libraryName);
     }
 
-    private File getPluginRoot()
-    {
-        try {
-            URL url = getClass().getResource("/" + getClass().getName().replace('.', '/') + ".class");
-            if (url.toString().startsWith("jar:")) {
-                url = new URL(url.toString().replaceAll("^jar:", "").replaceAll("![^!]*$", ""));
-            }
-
-            File folder = new File(url.toURI()).getParentFile();
-            for (;; folder = folder.getParentFile()) {
-                if (folder == null) {
-                    String message = String.format("OCI : %s folder not found.", PLUGIN_NAME);
-                    throw new RuntimeException(message);
-                }
-
-                if (folder.getName().startsWith(PLUGIN_NAME)) {
-                    return folder;
-                }
-            }
-        } catch (MalformedURLException | URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     public void open(String dbName, String userName, String password) throws SQLException
     {
         Pointer envHandlePointer = createPointerPointer();

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

@@ -27,7 +27,7 @@ public class OracleTests
         try {
             Class.forName("oracle.jdbc.OracleDriver");
         } catch (ClassNotFoundException e) {
-            throw new RuntimeException("You should put 'ojdbc7.jar' in 'embulk-output-oracle/driver' directory in order to test.");
+            throw new RuntimeException("You should put 'ojdbc7.jar' in 'embulk-output-oracle/test_jdbc_driver' directory in order to test.");
         }
 
         Path sqlFile = embulk.createTempFile("sql");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-08 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.12.jar
-- classpath/embulk-output-oracle-0.7.12.jar
+- classpath/embulk-output-jdbc-0.7.13.jar
+- classpath/embulk-output-oracle-0.7.13.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