embulk-input-postgresql 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e389a7bb6c9e0823b7031ffa4956418f7de65b
-  data.tar.gz: dfaafeb55848529ddec608cfa99cce0c7e86afb7
+  metadata.gz: 06c0715712d158b155fdec049b1d902ad2c73286
+  data.tar.gz: 7d9c2e7114cc14883303756a2810111c151237c1
 SHA512:
-  metadata.gz: 8be1b8a79f51b89af04cd249ccdeb3c991428a46ac8548969a9f50236dff08133c2a777fa99a81437d26c6f37892d6827dbf5fde0fbc0b071f6794e21a8f0328
-  data.tar.gz: c61b5d5833b830ab56f1a2525a84a9f2841f87fe235eeb89eb60b3e30eaad782abe3a30b86b2f2fe90736ca76c275284a424b2eb7a8603aa1dfff3f28e417d7a
+  metadata.gz: 2d1012d143bf14b25ef74805e7784da11a6dd1b39e6da8fe4c17108aba4c204799d1326716fdfd3a161f6f022db073d71692c174a8f3fbcfa3bd3b8fedacdade
+  data.tar.gz: 02c1db91904b99b8305c9bd9e057cfd6b498daadc652fac00b2edfd343908e2fbc8684bf33b953627f7659c486b52343f8c0d883cb8cc0e721c74051ed299a61

data/README.md

@@ -9,6 +9,7 @@ PostgreSQL input plugin for Embulk loads records from PostgreSQL.
 
 ## Configuration
 
+- **driver_path**: path to the jar file of the PostgreSQL JDBC driver. If not set, the bundled JDBC driver (PostgreSQL JDBC Driver 9.4-1205) will be used. (string)
 - **host**: database host name (string, required)
 - **port**: database port number (integer, 5432)
 - **user**: database login user name (string, required)

data/build.gradle

@@ -2,6 +2,7 @@ dependencies {
     compile project(':embulk-input-jdbc')
 
     compile 'org.postgresql:postgresql:9.4-1205-jdbc41'
+    defaultJdbcDriver 'org.postgresql:postgresql:9.4-1205-jdbc41'
 
     testCompile 'org.embulk:embulk-standards:0.8.15'
 }

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

@@ -1,29 +1,31 @@
 package org.embulk.input;
 
-import java.util.Map;
 import java.util.Properties;
 import java.sql.Connection;
-import java.sql.Driver;
+import java.sql.DriverManager;
 import java.sql.SQLException;
 
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
-import org.embulk.input.jdbc.JdbcColumnOption;
 import org.embulk.input.jdbc.getter.ColumnGetterFactory;
 import org.embulk.input.postgresql.PostgreSQLInputConnection;
 import org.embulk.input.postgresql.getter.PostgreSQLColumnGetterFactory;
 import org.embulk.spi.PageBuilder;
 import org.joda.time.DateTimeZone;
 
+import com.google.common.base.Optional;
+
 public class PostgreSQLInputPlugin
         extends AbstractJdbcInputPlugin
 {
-    private static final Driver driver = new org.postgresql.Driver();
-
     public interface PostgreSQLPluginTask
             extends PluginTask
     {
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
+
         @Config("host")
         public String getHost();
 
@@ -65,6 +67,8 @@ public class PostgreSQLInputPlugin
     {
         PostgreSQLPluginTask t = (PostgreSQLPluginTask) task;
 
+        loadDriver("org.postgresql.Driver", t.getDriverPath());
+
         String url = String.format("jdbc:postgresql://%s:%d/%s",
                 t.getHost(), t.getPort(), t.getDatabase());
 
@@ -90,7 +94,7 @@ public class PostgreSQLInputPlugin
 
         props.putAll(t.getOptions());
 
-        Connection con = driver.connect(url, props);
+        Connection con = DriverManager.getConnection(url, props);
         try {
             PostgreSQLInputConnection c = new PostgreSQLInputConnection(con, t.getSchema());
             con = null;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,9 +19,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.4.jar
-- classpath/embulk-input-postgresql-0.8.4.jar
-- classpath/postgresql-9.4-1205-jdbc41.jar
+- classpath/embulk-input-jdbc-0.8.5.jar
+- classpath/embulk-input-postgresql-0.8.5.jar
+- default_jdbc_driver/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/input/postgresql.rb
 - src/main/java/org/embulk/input/PostgreSQLInputPlugin.java
 - src/main/java/org/embulk/input/postgresql/PostgreSQLInputConnection.java