RubyGems - embulk-input-oracle - Versions diffs - 0.7.4 → 0.8.0 - Mend

embulk-input-oracle 0.7.4 → 0.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38c75d9629dab90ac79caf0fdf0b76f4a467e4e6
-  data.tar.gz: e5e32b42aa9707f50621d30be000ec0a3c98e048
+  metadata.gz: ab1f91c076cf91ec74900b6a463ad07abd8647b2
+  data.tar.gz: 2dc1d750ad0cd880de15893f3bf1222b4859521a
 SHA512:
-  metadata.gz: df3d2c1b5baa64c0c98f67cead38534ff6a16295bc7f7223db778679795d15bcd4844c27310cfb5e66d7c9a1e99c5b3ee93da4c6ef3cc7f747ffbabb29b364d4
-  data.tar.gz: 1b6d72f668bd00025f7bf92b5248296c3238594f1758642926e5aad0a2e281615c54e654dc5291524c1dc32a3ecaf3dd568f25976a5d942b5ef0784d28ea3d9c
+  metadata.gz: 7f65aff4ca8d4f34bbfac2b33a81dd315f68f4db9f01bb00147abad57df7f373d7c3807cb05391be979095356f82fef89710eaf087a1539553ea73ac2ea96404
+  data.tar.gz: 59e3ab2f6ee38e5eb7b72c96bb73b056246bcdcfc628e52031de3fb213cdcb7e8626edd01d867aa6ce10b7a4cabd826c014d257a0cb5793312fbf89855c68a6f

data/README.md CHANGED Viewed

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

data/classpath/{embulk-input-jdbc-0.7.4.jar → embulk-input-jdbc-0.8.0.jar} RENAMED Viewed

Binary file

data/classpath/{embulk-input-oracle-0.7.4.jar → embulk-input-oracle-0.8.0.jar} RENAMED Viewed

Binary file

data/src/test/java/org/embulk/input/oracle/OracleInputPluginTest.java CHANGED Viewed

@@ -1,36 +1,25 @@
 package org.embulk.input.oracle;
+import static java.util.Locale.ENGLISH;
 import static org.junit.Assert.assertEquals;
-import java.io.File;
-import java.io.IOException;
-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.SQLException;
-import java.sql.Statement;
 import java.util.Arrays;
-import java.util.List;
-import org.embulk.input.EmbulkPluginTester;
+import org.embulk.input.AbstractJdbcInputPluginTest;
 import org.embulk.input.OracleInputPlugin;
 import org.embulk.spi.InputPlugin;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
-public class OracleInputPluginTest
+public class OracleInputPluginTest extends AbstractJdbcInputPluginTest
 {
-    private static boolean prepared = false;
-    private static EmbulkPluginTester tester = new EmbulkPluginTester(InputPlugin.class, "oracle", OracleInputPlugin.class);
-    @BeforeClass
-    public static void prepare() throws SQLException
+    @Override
+    protected void prepare() throws SQLException
     {
+        tester.addPlugin(InputPlugin.class, "oracle", OracleInputPlugin.class);
         try {
             Class.forName("oracle.jdbc.OracleDriver");
         } catch (ClassNotFoundException e) {
@@ -38,75 +27,66 @@ public class OracleInputPluginTest
             return;
         }
-        Connection connection;
         try {
-            connection = DriverManager.getConnection("jdbc:oracle:thin:@localhost:1521/TESTDB", "TEST_USER", "test_pw");
+            connect();
         } catch (SQLException e) {
             System.err.println(e);
-            System.err.println("Warning: prepare a schema on Oracle (database = 'TESTDB', user = 'TEST_USER', password = 'test_pw').");
+            System.err.println(String.format(ENGLISH, "Warning: prepare a schema on Oracle 12c (server = %s, port = %d, database = %s, user = %s, password = %s, charset = UTF-8).",
+                    getHost(), getPort(), getDatabase(), getUser(), getPassword()));
+            // for example
+            //   CREATE USER TEST_USER IDENTIFIED BY "test_pw";
+            //   GRANT DBA TO TEST_USER;
             return;
         }
-        try {
-            try (Statement statement = connection.createStatement()) {
-                String drop1 = "DROP TABLE TEST1";
-                try {
-                    statement.execute(drop1);
-                } catch (SQLException e) {
-                    System.out.println(e);
-                }
-                String create1 =
-                        "CREATE TABLE TEST1 ("
-                        + "C1  DECIMAL(12,2),"
-                        + "C2  CHAR(8),"
-                        + "C3  VARCHAR2(8),"
-                        + "C4  NVARCHAR2(8),"
-                        + "C5  DATE,"
-                        + "C6  TIMESTAMP,"
-                        + "C7  TIMESTAMP(3))";
-                statement.execute(create1);
-                String insert1 =
-                        "INSERT INTO TEST1 VALUES("
-                        + "NULL,"
-                        + "NULL,"
-                        + "NULL,"
-                        + "NULL,"
-                        + "NULL,"
-                        + "NULL,"
-                        + "NULL)";
-                statement.executeUpdate(insert1);
-                String insert2 =
-                        "INSERT INTO TEST1 VALUES("
-                        + "-1234567890.12,"
-                        + "'ABCDEF',"
-                        + "'XYZ',"
-                        + "'ＡＢＣＤＥＦＧＨ',"
-                        + "'2015-06-04',"
-                        + "'2015-06-05 23:45:06',"
-                        + "'2015-06-06 23:45:06.789')";
-                statement.executeUpdate(insert2);
-            }
-        } finally {
-            connection.close();
-            prepared = true;
-        }
-    }
-    @AfterClass
-    public static void dispose()
-    {
-        tester.destroy();
+        enabled = true;
+        String drop1 = "DROP TABLE TEST1";
+        executeSQL(drop1, true);
+        String create1 =
+                "CREATE TABLE TEST1 ("
+                + "ID  CHAR(2),"
+                + "C1  DECIMAL(12,2),"
+                + "C2  CHAR(8),"
+                + "C3  VARCHAR2(8),"
+                + "C4  NVARCHAR2(8),"
+                + "C5  DATE,"
+                + "C6  TIMESTAMP,"
+                + "C7  TIMESTAMP(3),"
+                + "PRIMARY KEY(ID))";
+        executeSQL(create1);
+        String insert1 =
+                "INSERT INTO TEST1 VALUES("
+                + "'10',"
+                + "NULL,"
+                + "NULL,"
+                + "NULL,"
+                + "NULL,"
+                + "NULL,"
+                + "NULL,"
+                + "NULL)";
+        executeSQL(insert1);
+        String insert2 =
+                "INSERT INTO TEST1 VALUES("
+                + "'11',"
+                + "-1234567890.12,"
+                + "'ABCDEF',"
+                + "'XYZ',"
+                + "'ＡＢＣＤＥＦＧＨ',"
+                + "'2015-06-04',"
+                + "'2015-06-05 23:45:06',"
+                + "'2015-06-06 23:45:06.789')";
+        executeSQL(insert2);
     }
     @Test
     public void test() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/oracle/yml/input.yml"));
+        if (enabled) {
+            test("/oracle/yml/input.yml");
             assertEquals(Arrays.asList(
                     "C1,C2,C3,C4,C5,C6,C7",
                     "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015-06-04,2015-06-05 23:45:06,2015-06-06 23:45:06.789",
@@ -118,8 +98,8 @@ public class OracleInputPluginTest
     @Test
     public void testLower() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/oracle/yml/input-lower.yml"));
+        if (enabled) {
+            test("/oracle/yml/input-lower.yml");
             assertEquals(Arrays.asList(
                     "C1,C2,C3,C4,C5,C6,C7",
                     "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015-06-04,2015-06-05 23:45:06,2015-06-06 23:45:06.789",
@@ -131,12 +111,12 @@ public class OracleInputPluginTest
     @Test
     public void testQuery() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/oracle/yml/input-query.yml"));
+        if (enabled) {
+            test("/oracle/yml/input-query.yml");
             assertEquals(Arrays.asList(
                     "C1,C2,C3,C4,C5,C6,C7",
-                    ",,,,,,",
-                    "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015-06-04,2015-06-05 23:45:06,2015-06-06 23:45:06.789"),
+                    "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015-06-04,2015-06-05 23:45:06,2015-06-06 23:45:06.789",
+                    ",,,,,,"),
                     read("oracle-input000.00.csv"));
         }
     }
@@ -144,12 +124,12 @@ public class OracleInputPluginTest
     @Test
     public void testQueryLower() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/oracle/yml/input-query-lower.yml"));
+        if (enabled) {
+            test("/oracle/yml/input-query-lower.yml");
             assertEquals(Arrays.asList(
                     "C1,C2,C3,C4,C5,C6,C7",
-                    ",,,,,,",
-                    "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015-06-04,2015-06-05 23:45:06,2015-06-06 23:45:06.789"),
+                    "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015-06-04,2015-06-05 23:45:06,2015-06-06 23:45:06.789",
+                    ",,,,,,"),
                     read("oracle-input000.00.csv"));
         }
     }
@@ -157,12 +137,12 @@ public class OracleInputPluginTest
     @Test
     public void testColumnOptions() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/oracle/yml/input-column-options.yml"));
+        if (enabled) {
+            test("/oracle/yml/input-column-options.yml");
             assertEquals(Arrays.asList(
-                    "C1,C2,C3,C4,C5,C6,C7",
-                    ",,,,,,",
-                    "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015/06/04,2015/06/05 23:45:06,2015/06/06 23:45:06.789"),
+                    "ID,C1,C2,C3,C4,C5,C6,C7",
+                    "10,,,,,,,",
+                    "11,-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015/06/04,2015/06/05 23:45:06,2015/06/06 23:45:06.789"),
                     read("oracle-input000.00.csv"));
         }
     }
@@ -170,27 +150,20 @@ public class OracleInputPluginTest
     @Test
     public void testColumnOptionsLower() throws Exception
     {
-        if (prepared) {
-            tester.run(convertPath("/oracle/yml/input-column-options-lower.yml"));
+        if (enabled) {
+            test("/oracle/yml/input-column-options-lower.yml");
             assertEquals(Arrays.asList(
-                    "C1,C2,C3,C4,C5,C6,C7",
-                    ",,,,,,",
-                    "-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015/06/04,2015/06/05 23:45:06,2015/06/06 23:45:06.789"),
+                    "ID,C1,C2,C3,C4,C5,C6,C7",
+                    "10,,,,,,,",
+                    "11,-1.23456789012E9,ABCDEF  ,XYZ,ＡＢＣＤＥＦＧＨ,2015/06/04,2015/06/05 23:45:06,2015/06/06 23:45:06.789"),
                     read("oracle-input000.00.csv"));
         }
     }
-    private List<String> read(String path) throws IOException
+    @Override
+    protected Connection connect() throws SQLException
     {
-        FileSystem fs = FileSystems.getDefault();
-        return Files.readAllLines(fs.getPath(path), Charset.forName("UTF8"));
-    }
-    private String convertPath(String name) throws URISyntaxException
-    {
-        if (getClass().getResource(name) == null) {
-            return name;
-        }
-        return new File(getClass().getResource(name).toURI()).getAbsolutePath();
+        return DriverManager.getConnection(String.format(ENGLISH, "jdbc:oracle:thin:@%s:%d:%s", getHost(), getPort(), getDatabase()),
+                getUser(), getPassword());
     }
 }

data/src/test/resources/oracle/yml/input-column-options-lower.yml CHANGED Viewed

@@ -1,11 +1,12 @@
 in:
   type: oracle
-  host: localhost
-  database: TESTDB
-  user: TEST_USER
-  password: test_pw
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
   table: TEST1
   select: "*"
+  order_by: "ID"
   column_options:
     c5: {type: string, timestamp_format: '%Y/%m/%d', timezone: "+0900"}
     c6: {type: string, timestamp_format: '%Y/%m/%d %H:%M:%S', timezone: "+0900"}

data/src/test/resources/oracle/yml/input-column-options.yml CHANGED Viewed

@@ -1,11 +1,12 @@
 in:
   type: oracle
-  host: localhost
-  database: TESTDB
-  user: TEST_USER
-  password: test_pw
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
   table: TEST1
   select: "*"
+  order_by: "ID"
   column_options:
     C5: {type: string, timestamp_format: '%Y/%m/%d', timezone: "+0900"}
     C6: {type: string, timestamp_format: '%Y/%m/%d %H:%M:%S', timezone: "+0900"}

data/src/test/resources/oracle/yml/input-lower.yml CHANGED Viewed

@@ -1,9 +1,9 @@
 in:
   type: oracle
-  host: localhost
-  database: TESTDB
-  user: TEST_USER
-  password: test_pw
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
   table: test1
   select: "c1, c2, c3, c4, c5, c6, c7"
   order_by: c1

data/src/test/resources/oracle/yml/input-query-lower.yml CHANGED Viewed

@@ -1,10 +1,10 @@
 in:
   type: oracle
-  host: localhost
-  database: TESTDB
-  user: TEST_USER
-  password: test_pw
-  query: "select c1, c2, c3, c4, c5, c6, c7 from test1"
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
+  query: "select c1, c2, c3, c4, c5, c6, c7 from test1 order by c1"
 out:
   type: file

data/src/test/resources/oracle/yml/input-query.yml CHANGED Viewed

@@ -1,10 +1,10 @@
 in:
   type: oracle
-  host: localhost
-  database: TESTDB
-  user: TEST_USER
-  password: test_pw
-  query: "SELECT C1, C2, C3, C4, C5, C6, C7 FROM TEST1"
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
+  query: "SELECT C1, C2, C3, C4, C5, C6, C7 FROM TEST1 ORDER BY C1"
 out:
   type: file

data/src/test/resources/oracle/yml/input.yml CHANGED Viewed

@@ -1,9 +1,9 @@
 in:
   type: oracle
-  host: localhost
-  database: TESTDB
-  user: TEST_USER
-  password: test_pw
+  host: #host#
+  database: #database#
+  user: #user#
+  password: #password#
   table: TEST1
   select: "C1, C2, C3, C4, C5, C6, C7"
   order_by: C1

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-oracle
 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-oracle-0.7.4.jar
+- classpath/embulk-input-jdbc-0.8.0.jar
+- classpath/embulk-input-oracle-0.8.0.jar
 - lib/embulk/input/oracle.rb
 - src/main/java/org/embulk/input/OracleInputPlugin.java
 - src/main/java/org/embulk/input/oracle/OracleInputConnection.java