embulk-input-postgresql 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f32e58dff1927d5f0670a8a464f58b610292b10
-  data.tar.gz: dcbff14e3e9b025849de763833a35980df655a87
+  metadata.gz: 2c06aab77369550b3a8fe22a06ed19f08813b552
+  data.tar.gz: fe540f426d5a51eab8768330faf2964fa0323410
 SHA512:
-  metadata.gz: b5e4ef218b2a91133777dd18dc10073026c6839282fe0fac31f1114d9f1c9b4a9bf240981fc81a0132a45e24e03c824128e830a69f6cc0b29a7c40a7ceeb3f32
-  data.tar.gz: 2648def1e2996ecb44aae9b9b25b1d7393f37ec11b435b44bef94850cbf1a28865a4344d4afa23c9c3f64be5d2a7c932aafe3a24ee69846c0432727aef0c9094
+  metadata.gz: 563d09b98cd013a35089223a1f88dbf413be9dd5d894c3cd567420e0f67bd5d390eab565cdc1ad2b4dcf7c70cde6f8c1461b19a35cfa6562ddadff88a1458fb4
+  data.tar.gz: 5166f3f915d6159c7a576fbf0db217ad5ee153b72eaa051feb6f9c2b2c7452f38ef0cce6c1cbb83ec2313716abe0e30eef66f38ac10c91937d9150f7896a0cd8

data/README.md

@@ -1,6 +1,6 @@
-# PostgreSQL input plugins for Embulk
+# PostgreSQL input plugin for Embulk
 
-PostgreSQL input plugins for Embulk loads records from PostgreSQL.
+PostgreSQL input plugin for Embulk loads records from PostgreSQL.
 
 ## Overview
 

data/src/test/java/org/embulk/input/postgresql/PostgreSQLInputPluginTest.java

@@ -1,83 +1,62 @@
 package org.embulk.input.postgresql;
 
+import static java.util.Locale.ENGLISH;
 import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.Statement;
+import java.sql.SQLException;
 import java.util.Arrays;
-import java.util.List;
 
-import org.embulk.input.EmbulkPluginTester;
+import org.apache.commons.lang3.StringUtils;
+import org.embulk.input.AbstractJdbcInputPluginTest;
 import org.embulk.input.PostgreSQLInputPlugin;
 import org.embulk.spi.InputPlugin;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class PostgreSQLInputPluginTest
+public class PostgreSQLInputPluginTest extends AbstractJdbcInputPluginTest
 {
-    private static final String DATABASE = "test_db";
-    private static final String USER = "test_user";
-    private static final String PASSWORD = "test_pw";
-    private static final String URL = "jdbc:postgresql://localhost:5432/" + DATABASE;
-
-    private static boolean prepared = false;
-    private static EmbulkPluginTester tester = new EmbulkPluginTester(InputPlugin.class, "postgresql", PostgreSQLInputPlugin.class);
-
-    @BeforeClass
-    public static void prepare() throws Exception
+    @Override
+    protected void prepare() throws SQLException
     {
+        tester.addPlugin(InputPlugin.class, "postgresql", PostgreSQLInputPlugin.class);
+
         try {
             // Create User and Database
-            psql(String.format("DROP DATABASE IF EXISTS %s;", DATABASE));
-            psql(String.format("DROP USER IF EXISTS %s;", USER));
-            psql(String.format("CREATE USER %s WITH SUPERUSER PASSWORD '%s';", USER, PASSWORD));
-            psql(String.format("CREATE DATABASE %s WITH OWNER %s;", DATABASE, USER));
+            psql(String.format(ENGLISH, "DROP DATABASE IF EXISTS %s;", getDatabase()));
+            psql(String.format(ENGLISH, "DROP USER IF EXISTS %s;", getUser()));
+            psql(String.format(ENGLISH, "CREATE USER %s WITH SUPERUSER PASSWORD '%s';", getUser(), getPassword()));
+            psql(String.format(ENGLISH, "CREATE DATABASE %s WITH OWNER %s;", getDatabase(), getUser()));
         } catch (IOException e) {
             System.err.println(e);
             System.err.println("Warning: cannot prepare a database for testing embulk-input-postgresql.");
             // 1. install postgresql.
             // 2. add bin directory to path.
-            // 3. set environment variable PGPASSWORD
+            // 3. set environment variable PGPASSWORD or write pgpassword in tests.yml
             return;
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
         }
 
-        prepared = true;
+        enabled = true;
 
         // Insert Data
-        try(Connection connection = DriverManager.getConnection(URL, USER, PASSWORD)) {
-            try (Statement statement = connection.createStatement()) {
-                String sql = "";
-                sql += "DROP TABLE IF EXISTS input_hstore;";
-                sql += "CREATE EXTENSION IF NOT EXISTS hstore WITH SCHEMA public;";
-                sql += "CREATE TABLE input_hstore (c1 hstore);";
-                sql += "INSERT INTO input_hstore (c1) VALUES('\"a\" => \"b\"');";
-                statement.execute(sql);
-            }
-        }
-    }
-
-    @AfterClass
-    public static void dispose()
-    {
-        tester.destroy();
+        String sql = "";
+        sql += "DROP TABLE IF EXISTS input_hstore;";
+        sql += "CREATE EXTENSION IF NOT EXISTS hstore WITH SCHEMA public;";
+        sql += "CREATE TABLE input_hstore (c1 hstore);";
+        sql += "INSERT INTO input_hstore (c1) VALUES('\"a\" => \"b\"');";
+        executeSQL(sql);
     }
 
     @Test
     public void testHstoreAsString() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/yml/input_hstore.yml"));
+        if (enabled) {
+            test("/yml/input_hstore.yml");
             assertEquals(Arrays.asList("c1", "\"\"\"a\"\"=>\"\"b\"\"\""),
                     read("postgresql-input000.00.csv"));
         }
@@ -86,29 +65,19 @@ public class PostgreSQLInputPluginTest
     @Test
     public void testHstoreAsJson() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/yml/input_hstore2.yml"));
+        if (enabled) {
+            test("/yml/input_hstore2.yml");
             assertEquals(Arrays.asList("c1", "\"{\"\"a\"\":\"\"b\"\"}\""),
                     read("postgresql-input000.00.csv"));
         }
     }
 
-    private List<String> read(String path) throws IOException
-    {
-        FileSystem fs = FileSystems.getDefault();
-        return Files.readAllLines(fs.getPath(path), Charset.defaultCharset());
-    }
-
-    private String convertPath(String name) throws URISyntaxException
-    {
-        if (getClass().getResource(name) == null) {
-            return name;
-        }
-        return new File(getClass().getResource(name).toURI()).getAbsolutePath();
-    }
-
-    private static void psql(String sql) throws IOException, InterruptedException {
+    private void psql(String sql) throws IOException, InterruptedException {
         ProcessBuilder pb = new ProcessBuilder("psql", "-w", "-c", sql);
+        String pgPassword = (String)getTestConfig("pgpassword", false);
+        if (!StringUtils.isEmpty(pgPassword)) {
+            pb.environment().put("PGPASSWORD", pgPassword);
+        }
         System.out.println("PSQL: " + pb.command().toString());
         final Process process = pb.start();
         final int code = process.waitFor();
@@ -123,4 +92,11 @@ public class PostgreSQLInputPluginTest
                     "Command finished with non-zero exit code. Exit code is %d.", code));
         }
     }
+
+    @Override
+    protected Connection connect() throws SQLException
+    {
+        return DriverManager.getConnection(String.format(ENGLISH, "jdbc:postgresql://%s:%d/%s", getHost(), getPort(), getDatabase()),
+                getUser(), getPassword());
+    }
 }

data/src/test/resources/yml/input_hstore.yml

@@ -1,9 +1,9 @@
 in:
   type: postgresql
-  host: localhost
-  database: test_db
-  user: test_user
-  password: test_pw
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
   table: input_hstore
   select: "*"
 out:

data/src/test/resources/yml/input_hstore2.yml

@@ -1,9 +1,9 @@
 in:
   type: postgresql
-  host: localhost
-  database: test_db
-  user: test_user
-  password: test_pw
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
   table: input_hstore
   select: "*"
   column_options:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-13 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.7.4.jar
-- classpath/embulk-input-postgresql-0.7.4.jar
+- classpath/embulk-input-jdbc-0.8.0.jar
+- classpath/embulk-input-postgresql-0.8.0.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/input/postgresql.rb
 - src/main/java/org/embulk/input/PostgreSQLInputPlugin.java