embulk-output-oracle 0.4.5 → 0.5.0

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

@@ -2,40 +2,27 @@ package org.embulk.output.oracle;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.math.BigDecimal;
-import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TimeZone;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
-import org.embulk.input.filesplit.LocalFileSplitInputPlugin;
+import org.embulk.output.AbstractJdbcOutputPluginTest;
 import org.embulk.output.tester.EmbulkPluginTester;
-import org.embulk.spi.InputPlugin;
 
 
-public class OracleOutputPluginTestImpl
+public class OracleOutputPluginTestImpl extends AbstractJdbcOutputPluginTest
 {
     private EmbulkPluginTester tester;
     private String pluginName;
@@ -72,8 +59,6 @@ public class OracleOutputPluginTestImpl
             //   GRANT DBA TO EMBULK_USER;
         }
 
-        convertPath("/data/test2/").mkdirs();
-
         return null;
     }
 
@@ -84,7 +69,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert.yml");
+        run("/oracle/yml/test-insert.yml");
 
         assertTable(table);
     }
@@ -95,7 +80,7 @@ public class OracleOutputPluginTestImpl
 
         dropTable(table);
 
-        run("/yml/test-insert.yml");
+        run("/oracle/yml/test-insert.yml");
 
         assertGeneratedTable1(table);
     }
@@ -107,7 +92,8 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert-empty.yml");
+        new File(convertPath("/oracle/data/"), "test2").mkdir();
+        run("/oracle/yml/test-insert-empty.yml");
 
         assertTableEmpty(table);
     }
@@ -120,7 +106,7 @@ public class OracleOutputPluginTestImpl
         createTable(table);
         insertRecord(table);
 
-        run("/yml/test-truncate-insert.yml");
+        run("/oracle/yml/test-truncate-insert.yml");
 
         assertTable(table);
     }
@@ -133,7 +119,7 @@ public class OracleOutputPluginTestImpl
         createTable(table);
         insertRecord(table);
 
-        run("/yml/test-truncate-insert-oci-method.yml");
+        run("/oracle/yml/test-truncate-insert-oci-method.yml");
 
         assertTable(table);
     }
@@ -144,7 +130,7 @@ public class OracleOutputPluginTestImpl
 
         dropTable(table);
 
-        run("/yml/test-truncate-insert.yml");
+        run("/oracle/yml/test-truncate-insert.yml");
 
         assertGeneratedTable1(table);
     }
@@ -156,7 +142,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert-direct.yml");
+        run("/oracle/yml/test-insert-direct.yml");
 
         assertTable(table);
     }
@@ -168,7 +154,8 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert-direct-empty.yml");
+        new File(convertPath("/oracle/data/"), "test2").mkdir();
+        run("/oracle/yml/test-insert-direct-empty.yml");
 
         assertTableEmpty(table);
     }
@@ -179,7 +166,7 @@ public class OracleOutputPluginTestImpl
 
         dropTable(table);
 
-        run("/yml/test-insert-direct.yml");
+        run("/oracle/yml/test-insert-direct.yml");
 
         assertGeneratedTable1(table);
     }
@@ -191,7 +178,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert-direct-direct-method.yml");
+        run("/oracle/yml/test-insert-direct-direct-method.yml");
 
         assertTable(table);
     }
@@ -203,21 +190,19 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert-direct-oci-method.yml");
+        run("/oracle/yml/test-insert-direct-oci-method.yml");
 
         assertTable(table);
     }
 
     public void testInsertDirectOCIMethodSplit() throws Exception
     {
-        tester.addPlugin(InputPlugin.class, "filesplit", LocalFileSplitInputPlugin.class);
-
         String table = "TEST1";
 
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-insert-direct-oci-method-split.yml");
+        run("/oracle/yml/test-insert-direct-oci-method-split.yml");
 
         assertTable(table);
     }
@@ -229,7 +214,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-url.yml");
+        run("/oracle/yml/test-url.yml");
 
         assertTable(table);
     }
@@ -241,7 +226,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-replace.yml");
+        run("/oracle/yml/test-replace.yml");
 
         assertGeneratedTable2(table);
     }
@@ -253,7 +238,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-replace-oci-method.yml");
+        run("/oracle/yml/test-replace-oci-method.yml");
 
         assertGeneratedTable2(table);
     }
@@ -265,7 +250,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-replace-empty.yml");
+        run("/oracle/yml/test-replace-empty.yml");
 
         assertTableEmpty(table);
     }
@@ -276,7 +261,7 @@ public class OracleOutputPluginTestImpl
 
         dropTable(table);
 
-        run("/yml/test-replace.yml");
+        run("/oracle/yml/test-replace.yml");
 
         assertGeneratedTable2(table);
     }
@@ -289,7 +274,7 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-replace-long-name.yml");
+        run("/oracle/yml/test-replace-long-name.yml");
 
         assertGeneratedTable2(table);
     }
@@ -298,7 +283,7 @@ public class OracleOutputPluginTestImpl
     {
         String table = "ＴＥＳＴ123456789012345678";
 
-        run("/yml/test-replace-long-name-multibyte.yml");
+        run("/oracle/yml/test-replace-long-name-multibyte.yml");
 
         assertGeneratedTable2(table);
     }
@@ -310,17 +295,11 @@ public class OracleOutputPluginTestImpl
         dropTable(table);
         createTable(table);
 
-        run("/yml/test-string-timestamp.yml");
+        run("/oracle/yml/test-string-timestamp.yml");
 
         assertTable(table);
     }
 
-    private void dropTable(String table) throws SQLException
-    {
-        String sql = String.format("DROP TABLE %s", table);
-        executeSQL(sql, true);
-    }
-
     private void createTable(String table) throws SQLException
     {
         String sql = String.format("CREATE TABLE %s ("
@@ -487,6 +466,15 @@ public class OracleOutputPluginTestImpl
         }
     }
 
+    @Override
+    protected Object getValue(ResultSet resultSet, int index) throws SQLException
+    {
+        if (resultSet.getMetaData().getColumnTypeName(index).equals("CLOB")) {
+            return resultSet.getString(index);
+        }
+        return super.getValue(resultSet, index);
+    }
+
 
     private Timestamp toTimestamp(String s, TimeZone timeZone)
     {
@@ -510,66 +498,8 @@ public class OracleOutputPluginTestImpl
         return constructor.newInstance(toTimestamp(s, timeZone));
     }
 
-
-    private List<List<Object>> select(String table) throws SQLException
-    {
-        try (Connection connection = connect()) {
-            try (Statement statement = connection.createStatement()) {
-                List<List<Object>> rows = new ArrayList<List<Object>>();
-                String sql = "SELECT * FROM " + table;
-                System.out.println(sql);
-                try (ResultSet resultSet = statement.executeQuery(sql)) {
-                    while (resultSet.next()) {
-                        List<Object> row = new ArrayList<Object>();
-                        for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
-                            Object value = resultSet.getObject(i);
-                            if (value != null && value.getClass().getName().equals("oracle.sql.CLOB")) {
-                                value = resultSet.getString(i);
-                            }
-                            row.add(value);
-                        }
-                        rows.add(row);
-                    }
-                }
-                // cannot sort by CLOB, so sort by Java
-                Collections.sort(rows, new Comparator<List<Object>>() {
-                    @Override
-                    public int compare(List<Object> o1, List<Object> o2) {
-                        return o1.toString().compareTo(o2.toString());
-                    }
-                });
-                return rows;
-            }
-        }
-
-    }
-
-
-    private void executeSQL(String sql) throws SQLException
-    {
-        executeSQL(sql, false);
-    }
-
-    private void executeSQL(String sql, boolean ignoreError) throws SQLException
-    {
-        try (Connection connection = connect()) {
-            try {
-                connection.setAutoCommit(true);
-
-                try (Statement statement = connection.createStatement()) {
-                    System.out.println(String.format("Execute SQL : \"%s\".", sql));
-                    statement.execute(sql);
-                }
-
-            } catch (SQLException e) {
-                if (!ignoreError) {
-                    throw e;
-                }
-            }
-        }
-    }
-
-    private static Connection connect() throws SQLException
+    @Override
+    protected Connection connect() throws SQLException
     {
         return DriverManager.getConnection("jdbc:oracle:thin:@localhost:1521:TESTDB", "TEST_USER", "test_pw");
     }
@@ -579,45 +509,10 @@ public class OracleOutputPluginTestImpl
         tester.run(convertYml(ymlName));
     }
 
-    private String convertYml(String ymlName)
+    @Override
+    protected String convertYmlLine(String line)
     {
-        try {
-            File ymlPath = convertPath(ymlName);
-            File tempYmlPath = new File(ymlPath.getParentFile(), "temp-" + ymlPath.getName());
-            Pattern pathPrefixPattern = Pattern.compile("^ *path(_prefix)?: '(.*)'$");
-            try (BufferedReader reader = new BufferedReader(new FileReader(ymlPath))) {
-                try (BufferedWriter writer = new BufferedWriter(new FileWriter(tempYmlPath))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        line = line.replaceAll("type: oracle", "type: " + pluginName);
-                        Matcher matcher = pathPrefixPattern.matcher(line);
-                        if (matcher.matches()) {
-                            int group = 2;
-                            writer.write(line.substring(0, matcher.start(group)));
-                            writer.write(convertPath(matcher.group(group)).getAbsolutePath());
-                            writer.write(line.substring(matcher.end(group)));
-                        } else {
-                            writer.write(line);
-                        }
-                        writer.newLine();
-                    }
-                }
-            }
-            return tempYmlPath.getAbsolutePath();
-
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private File convertPath(String name)
-    {
-        try {
-            File root = new File(getClass().getResource("/dummy.txt").toURI()).getParentFile();
-            return new File(root, name);
-        } catch (URISyntaxException e) {
-            throw new RuntimeException(e);
-        }
+        return line.replaceAll("type: oracle", "type: " + pluginName);
     }
 
 }

data/src/test/resources/{yml → oracle/yml}/test-insert-direct-direct-method.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-insert-direct-empty.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test2/'
+  path_prefix: '/oracle/data/test2/'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-insert-direct-oci-method-split.yml

@@ -1,6 +1,6 @@
 in:
   type: filesplit
-  path: '/data/test1/test1.csv'
+  path: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-insert-direct-oci-method.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-insert-direct.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-insert-empty.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test2/'
+  path_prefix: '/oracle/data/test2/'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-insert.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-replace-empty.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test2/'
+  path_prefix: '/oracle/data/test2/'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-replace-long-name-multibyte.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-replace-long-name.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-replace-oci-method.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-replace.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-string-timestamp.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-truncate-insert-oci-method.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-truncate-insert.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

data/src/test/resources/{yml → oracle/yml}/test-url.yml

@@ -1,6 +1,6 @@
 in:
   type: file
-  path_prefix: '/data/test1/test1.csv'
+  path_prefix: '/oracle/data/test1/test1.csv'
   parser:
     charset: UTF-8
     newline: CRLF

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-oracle
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,18 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- lib/embulk/linux_x64/libembulk-output-oracle.so
 - lib/embulk/output/oracle.rb
-- lib/embulk/win_x64/embulk-output-oracle.dll
-- src/main/cpp/common/dir-path-load.cpp
-- src/main/cpp/common/dir-path-load.h
-- src/main/cpp/common/embulk-output-oracle.cpp
-- src/main/cpp/common/org_embulk_output_oracle_oci_OCI.h
-- src/main/cpp/linux/build.sh
-- src/main/cpp/win/build.bat
-- src/main/cpp/win/dllmain.cpp
-- src/main/cpp/win/embulk-output-oracle.sln
-- src/main/cpp/win/embulk-output-oracle.vcxproj
 - src/main/java/org/embulk/output/OracleOutputPlugin.java
 - src/main/java/org/embulk/output/oracle/DirectBatchInsert.java
 - src/main/java/org/embulk/output/oracle/InsertMethod.java
@@ -44,37 +33,31 @@ files:
 - src/main/java/org/embulk/output/oracle/oci/OCIWrapper.java
 - src/main/java/org/embulk/output/oracle/oci/RowBuffer.java
 - src/main/java/org/embulk/output/oracle/oci/TableDefinition.java
-- src/test/cpp/common/embulk-output-oracle-test.cpp
-- src/test/cpp/linux/build.sh
-- src/test/cpp/win/build.bat
-- src/test/cpp/win/embulk-output-oracle-test.vcxproj
 - src/test/java/org/embulk/input/filesplit/LocalFileSplitInputPlugin.java
 - src/test/java/org/embulk/input/filesplit/PartialFile.java
 - src/test/java/org/embulk/input/filesplit/PartialFileInputStream.java
 - src/test/java/org/embulk/output/oracle/OracleOutputPluginTest.java
 - src/test/java/org/embulk/output/oracle/OracleOutputPluginTestImpl.java
 - src/test/java/org/embulk/output/oracle/TimestampFormatTest.java
-- src/test/java/org/embulk/output/tester/EmbulkPluginTester.java
-- src/test/resources/data/test1/test1.csv
-- src/test/resources/dummy.txt
-- src/test/resources/yml/test-insert-direct-direct-method.yml
-- src/test/resources/yml/test-insert-direct-empty.yml
-- src/test/resources/yml/test-insert-direct-oci-method-split.yml
-- src/test/resources/yml/test-insert-direct-oci-method.yml
-- src/test/resources/yml/test-insert-direct.yml
-- src/test/resources/yml/test-insert-empty.yml
-- src/test/resources/yml/test-insert.yml
-- src/test/resources/yml/test-replace-empty.yml
-- src/test/resources/yml/test-replace-long-name-multibyte.yml
-- src/test/resources/yml/test-replace-long-name.yml
-- src/test/resources/yml/test-replace-oci-method.yml
-- src/test/resources/yml/test-replace.yml
-- src/test/resources/yml/test-string-timestamp.yml
-- src/test/resources/yml/test-truncate-insert-oci-method.yml
-- src/test/resources/yml/test-truncate-insert.yml
-- src/test/resources/yml/test-url.yml
-- classpath/embulk-output-jdbc-0.4.5.jar
-- classpath/embulk-output-oracle-0.4.5.jar
+- src/test/resources/oracle/data/test1/test1.csv
+- src/test/resources/oracle/yml/test-insert-direct-direct-method.yml
+- src/test/resources/oracle/yml/test-insert-direct-empty.yml
+- src/test/resources/oracle/yml/test-insert-direct-oci-method-split.yml
+- src/test/resources/oracle/yml/test-insert-direct-oci-method.yml
+- src/test/resources/oracle/yml/test-insert-direct.yml
+- src/test/resources/oracle/yml/test-insert-empty.yml
+- src/test/resources/oracle/yml/test-insert.yml
+- src/test/resources/oracle/yml/test-replace-empty.yml
+- src/test/resources/oracle/yml/test-replace-long-name-multibyte.yml
+- src/test/resources/oracle/yml/test-replace-long-name.yml
+- src/test/resources/oracle/yml/test-replace-oci-method.yml
+- src/test/resources/oracle/yml/test-replace.yml
+- src/test/resources/oracle/yml/test-string-timestamp.yml
+- src/test/resources/oracle/yml/test-truncate-insert-oci-method.yml
+- src/test/resources/oracle/yml/test-truncate-insert.yml
+- src/test/resources/oracle/yml/test-url.yml
+- classpath/embulk-output-jdbc-0.5.0.jar
+- classpath/embulk-output-oracle-0.5.0.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0