embulk-filter-oracle_lookup 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9885f845088fdd2241e758fe03112032fcc3b35a16428ffe62aa3e756372ffd
-  data.tar.gz: 82df7d21ab5a39399139c8ffc7870b165a9455cb44dcc42b220f5c267a8def22
+  metadata.gz: 7407cfe1f3eec44230c5110dfef213e3346fe52940d4d45850081a53ec37fd3e
+  data.tar.gz: aa1fc40140632a49db977e59e684506e9b08ccc0925fe77ddfd29571d508bb9c
 SHA512:
-  metadata.gz: 75e96a6ac0cdf490fda5fad8f6c646985f805e89f9024af91330df2d0cde0361503e133f3dc47cc1d1b56feb31a0e4b52ca5cf8d705fbd5d7beebd4bb4ee0e92
-  data.tar.gz: cd99d4d7b01a25f1b0f8c9429578720d5be694e55e76578ede5d8fcff4be6a70ac6227e5d9bd287786c1ce68dbcd5c04e5b80e7e45d38993be2903f7006cd091
+  metadata.gz: 202f64e9d632764ca57353b584f528f07130576f15c9afaad0517804d3ec1f7b739cf712f7d573cefb97ffad2cbb7cea1bb60b8211a8813e332720f0f14dbd5d
+  data.tar.gz: adf20f498eee0023bca5b5f95df59660442d36fa5a069b6e29bfcb5134750b0eda854db82aac46cc12d0943e4d9088fb65467ed9e02ae3c5782b1b14aec241c9

data/README.md

@@ -1,3 +1,13 @@
+
+<p align="center">
+  <a href="https://www.infoobjects.com/" target="blank"><img src="screenshots/logo.png" width="150" alt="InfoObjects Logo" /></a>
+</p>
+<p align="center">Infoobjects is a consulting company that helps enterprises transform how and where they run applications and infrastructure.
+From strategy, to implementation, to ongoing managed services, Infoobjects creates tailored cloud solutions for enterprises at all stages of the cloud journey.</p>
+
+# Postgres lookup filter plugin for Embulk
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
+
 # Oracle lookup filter plugin for Embulk
 ​
 An Embulk filter plugin for Lookup Transformation with Oracle database
@@ -8,7 +18,7 @@ An Embulk filter plugin for Lookup Transformation with Oracle database
     - **host**: database host (example `localhost`) (required)
     - **port**: database port (example port for oracle `1521`) (required)
     - **database**: database name (required)
-    - **tablename**: table name of your database (required)
+    - **table**: table name of your database (required)
     - **username**: username for your database (required)
     - **password**: password for database (required)
     - **mapping_from**: (Name of columns to be matched with table 2 columns) (required)
@@ -131,4 +141,7 @@ Release gem:
 ​
 ```
 $ ./gradlew gemPush
-```
+```
+## Licensing
+
+InfoObjects [license](LICENSE) (MIT License)

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.0"
+version = "0.2.0"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/example/config.yml

@@ -3,7 +3,7 @@ exec:
   min_output_tasks: 1
 in:
   type: file
-  path_prefix: C:\Users\Abhishek Gupta\Desktop\new one\embulk-filter-oracle_lookup\calendar.csv
+  path_prefix: C:\Users\Abhishek Gupta\Desktop\github\embulk-filter-oracle_lookup\calendar.csv
   parser:
     type: csv
     columns:
@@ -17,7 +17,7 @@ filters:
     host: localhost
     port: 1521
     database: XE
-    tablename: country
+    table: country
     username: sys as sysdba
     password: root
     mapping_from:

data/src/main/java/org/embulk/filter/oracle_lookup/OracleConnection.java

@@ -2,6 +2,7 @@ package org.embulk.filter.oracle_lookup;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.SQLException;
 
 public class OracleConnection {
 
@@ -20,14 +21,18 @@ public class OracleConnection {
     }
 
     public static Connection getConnection(OracleLookupFilterPlugin.PluginTask task){
-        if(connection==null){
-            try {
-                new OracleConnection(task);
-                return connection;
-            } catch (Exception e) {
-                e.printStackTrace();
-                throw new RuntimeException();
+        try {
+            if(connection==null || connection.isClosed()){
+                try {
+                    new OracleConnection(task);
+                    return connection;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new RuntimeException();
+                }
             }
+        }catch (Exception e){
+            throw new RuntimeException(e);
         }
         return connection;
     }

data/src/main/java/org/embulk/filter/oracle_lookup/OracleLookupFilterPlugin.java

@@ -29,7 +29,7 @@ public class OracleLookupFilterPlugin
         @Config("database")
         public String getDatabase();
 
-        @Config("tablename")
+        @Config("table")
         public String getTableName();
 
         @Config("username")
@@ -246,38 +246,49 @@ public class OracleLookupFilterPlugin
 
         private void add_builder(int colNum, Column column, List<String> searchingKeyData, List<String> inputColumns, Map<String, Integer> keyMap) {
             if (Types.STRING.equals(column.getType())) {
-                if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
-                    searchingKeyData.add(reader.getString(column));
-                    int key = keyMap.get("Key");
-                    keyMap.put("Key", ++key);
+                if (keyMap.get("Key") < inputColumns.size()) {
+                    if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
+                        searchingKeyData.add(reader.getString(column));
+                        int key = keyMap.get("Key");
+                        keyMap.put("Key", ++key);
+                    }
                 }
                 builder.setString(colNum, reader.getString(column));
             } else if (Types.BOOLEAN.equals(column.getType())) {
-                if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
-                    searchingKeyData.add(String.valueOf(reader.getBoolean(column)));
-                    int key = keyMap.get("Key");
-                    keyMap.put("Key", ++key);
+                if (keyMap.get("Key") < inputColumns.size()) {
+                    if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
+                        searchingKeyData.add(String.valueOf(reader.getBoolean(column)));
+                        int key = keyMap.get("Key");
+                        keyMap.put("Key", ++key);
+                    }
                 }
                 builder.setBoolean(colNum, reader.getBoolean(column));
             } else if (Types.DOUBLE.equals(column.getType())) {
-                if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
-                    searchingKeyData.add(String.valueOf(reader.getDouble(column)));
-                    int key = keyMap.get("Key");
-                    keyMap.put("Key", ++key);
+                if (keyMap.get("Key") < inputColumns.size()) {
+                    if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
+                        searchingKeyData.add(String.valueOf(reader.getDouble(column)));
+                        int key = keyMap.get("Key");
+                        keyMap.put("Key", ++key);
+                    }
                 }
                 builder.setDouble(colNum, reader.getDouble(column));
             } else if (Types.LONG.equals(column.getType())) {
-                if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
-                    searchingKeyData.add(String.valueOf(reader.getLong(column)));
-                    int key = keyMap.get("Key");
-                    keyMap.put("Key", ++key);
+                if (keyMap.get("Key") < inputColumns.size()) {
+                    if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
+                        searchingKeyData.add(String.valueOf(reader.getLong(column)));
+                        int key = keyMap.get("Key");
+                        keyMap.put("Key", ++key);
+                    }
                 }
+
                 builder.setLong(colNum, reader.getLong(column));
             } else if (Types.TIMESTAMP.equals(column.getType())) {
-                if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
-                    searchingKeyData.add(String.valueOf(reader.getTimestamp(column)));
-                    int key = keyMap.get("Key");
-                    keyMap.put("Key", ++key);
+                if (keyMap.get("Key") < inputColumns.size()) {
+                    if (column.getName().equalsIgnoreCase(inputColumns.get(keyMap.get("Key")))) {
+                        searchingKeyData.add(String.valueOf(reader.getTimestamp(column)));
+                        int key = keyMap.get("Key");
+                        keyMap.put("Key", ++key);
+                    }
                 }
                 builder.setTimestamp(colNum, reader.getTimestamp(column));
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-oracle_lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Infoobjects Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,11 +46,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- LICENSE.txt
+- LICENSE
 - README.md
 - build.gradle
 - calendar.csv
-- classpath/embulk-filter-oracle_lookup-0.1.0.jar
+- classpath/embulk-filter-oracle_lookup-0.2.0.jar
 - classpath/mysql-connector-java-8.0.19.jar
 - classpath/protobuf-java-3.6.1.jar
 - config/checkstyle/checkstyle.xml
@@ -61,6 +61,7 @@ files:
 - gradlew
 - gradlew.bat
 - lib/embulk/filter/oracle_lookup.rb
+- screenshots/logo.png
 - src/main/java/org/embulk/filter/oracle_lookup/OracleConnection.java
 - src/main/java/org/embulk/filter/oracle_lookup/OracleLookupFilterPlugin.java
 - src/test/java/org/embulk/filter/oracle_lookup/TestOracleLookupFilterPlugin.java