embulk-filter-mssql_lookup 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 943d846e1cd6d2971f5caa0e34567b9a3ada60433974d8e365377ec8fbf96644
-  data.tar.gz: 19b8c8f9f49c5e2f5234089dca6b9ac3a2e1b8a8b0ed09f2d24326599b7780ab
+  metadata.gz: c29334c9d9bc7a66dcd62e56377af658c8d4db81635e2d8ee557ddecffe8a2e7
+  data.tar.gz: 0ccd4b8ef4577a82e852a481c91ecc3afcf00ea7384d101f035f19f47f54133f
 SHA512:
-  metadata.gz: 9537885d100efde4348394107dd7147ed4cf487e5c0a8af2eaa09b2782bd58b80c6e311a7d8062b5df07b2c7191e7be3b642c85facbbc591035491e73d7f59bb
-  data.tar.gz: 5e563167b6676531452ede2bfbd082afda4e7751dce0a85b8a6869ab91178002f4a1545453a0653ad0bde3d6d87c76bbaef9d68a75d872793015071367b4fe29
+  metadata.gz: db8f38265b0bcfc93334bb7d491873e62039f100588a1803d1e2788d6fb7fef7bb084db9f21bbd510b96bdf75542e0c106933d56791ac6e979e10143fab5cf63
+  data.tar.gz: 7e4be4ab0bccfc5942cacac755c9c0aa2c1ff17032269d01fcd620f1b696dcaba60770f920171ba13eb49984071ea1e3092fefa19a1685a343738c9a6971da8d

data/README.md

@@ -13,26 +13,26 @@ An Embulk filter plugin for Lookup Transformation with MS-SQL database
 
 - **mssql_lookup**: Required attributes for the LookUp Filter Plugin -
     - **filters**:
-    - **type**: Name of lookup type (required)
-    - **driver_path**: driver path of the driver which has been installed in the system
-    - **driver_class**: driver class name
-    - **host**: database host (example `localhost`) (required)
-    - **port**: database port (example port for mssql `1433`) (required)
-    - **database**: database name (required)
-    - **schemaName**: name of schema in database in which table is located
-    - **table_name**: 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)
-        - **Name of column-1**: column name-1 from input file
-        - **Name of column-2**: column name-2 from input file etc ...
-    - **mapping_to**:   (Name of columns to be matched with table 1 columns) (required)
-        - **Name of column-1**: column name-1 from input file
-        - **Name of column-2**: column name-2 from input file
-    - **new_columns**:   (New generated column names) (required)
-        - **Name-1,Type-1**: Any Name, Type of the name { name: car_id, type: string }
-        - **Name-2,Type-2**: Any Name, Type of the name { name: category, type: string }
-        - **Name-3,Type-3**: Any Name, Type of the name { name: fuel_capacity, type: string } etc ...
+        - **type**: Name of lookup type (required)
+        - **driver_path**: driver path of the driver which has been installed in the system
+        - **driver_class**: driver class name
+        - **host**: database host (example `localhost`) (required)
+        - **port**: database port (example port for mssql `1433`) (required)
+        - **database**: database name (required)
+        - **schemaName**: name of schema in database in which table is located
+        - **table_name**: 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)
+            - **Name of column-1**: column name-1 from input file
+            - **Name of column-2**: column name-2 from input file etc ...
+        - **mapping_to**:   (Name of columns to be matched with table 1 columns) (required)
+            - **Name of column-1**: column name-1 from input file
+            - **Name of column-2**: column name-2 from input file
+        - **new_columns**:   (New generated column names) (required)
+            - **Name-1,Type-1**: Any Name, Type of the name { name: car_id, type: string }
+            - **Name-2,Type-2**: Any Name, Type of the name { name: category, type: string }
+            - **Name-3,Type-3**: Any Name, Type of the name { name: fuel_capacity, type: string } etc ...
 ## Example - columns
 
 Customer.csv for table 1 is as follows :-
@@ -122,9 +122,9 @@ filters:
 ```
 
 Notes:
-1. mapping_from attribute should be in same order as mentioned in input file.
+1. mapping_from attribute should be in the same order as mentioned in the input file.
 
-2. This attribute needs to be provided(in input plugin) while using jdbc input plugin in case datatype is Number:------
+2. In case with JDBC plugin if any integer column returned as float/decimal then use to cast that column as long as below
 ``` 
      column_options: 
      id: {value_type: long}

data/build.gradle

@@ -13,13 +13,13 @@ configurations {
     provided
 }
 
-version = "0.1.4"
+version = "0.1.5"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile 'com.microsoft.sqlserver:sqljdbc4:4.0'
+//    compile 'com.microsoft.sqlserver:sqljdbc4:4.0'
     compile  "org.embulk:embulk-core:0.9.8"
     provided "org.embulk:embulk-core:0.9.8"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"

data/src/main/java/org/embulk/filter/mssql_lookup/DatabaseConnection.java

@@ -63,6 +63,11 @@ public class DatabaseConnection {
                 return mssqlJdbcDriver.get();
             }
 
+        if (driverPath.isPresent()) {
+            logger.info(
+                    "\"driver_path\" is set to load the MsSQL JDBC driver class \"{}\". Adding it to classpath.", className);
+            this.addDriverJarToClasspath(driverPath.get());
+        }
             try {
                 // If the class is found from the ClassLoader of the plugin, that is prioritized the highest.
                 final Class<? extends java.sql.Driver> found = loadJdbcDriverClassForName(className);
@@ -76,15 +81,8 @@ public class DatabaseConnection {
                 return found;
             }
             catch (final ClassNotFoundException ex) {
-                // Pass-through once.
-            }
-
-            if (driverPath.isPresent()) {
-                logger.info(
-                        "\"driver_path\" is set to load the MsSQL JDBC driver class \"{}\". Adding it to classpath.", className);
-                this.addDriverJarToClasspath(driverPath.get());
+                //throw new ConfigException("The MsSQL JDBC driver for the class \"" + className + "\" is not found.", ex);
             }
-            else {
                 final File root = this.findPluginRoot();
                 final File driverLib = new File(root, "default_jdbc_driver");
                 final File[] files = driverLib.listFiles(new FileFilter() {
@@ -105,12 +103,16 @@ public class DatabaseConnection {
                                     + " in \"default_jdbc_driver\" at {}.", className, file.getAbsolutePath());
                     this.addDriverJarToClasspath(file.getAbsolutePath());
                 }
-            }
 
             try {
-                // Retrying to find the class from the ClassLoader of the plugin.
+                // If the class is found from the ClassLoader of the plugin, that is prioritized the highest.
                 final Class<? extends java.sql.Driver> found = loadJdbcDriverClassForName(className);
                 mssqlJdbcDriver.compareAndSet(null, found);
+                if (driverPath.isPresent()) {
+                    logger.warn(
+                            "\"driver_path\" is set while the MsSQL JDBC driver class \"{}\" is found from the PluginClassLoader."
+                                    + " \"driver_path\" is ignored.", className);
+                }
                 return found;
             }
             catch (final ClassNotFoundException ex) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-mssql_lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Infoobjects Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,8 +49,7 @@ files:
 - LICENSE
 - README.md
 - build.gradle
-- classpath/embulk-filter-mssql_lookup-0.1.4.jar
-- classpath/sqljdbc4-4.0.jar
+- classpath/embulk-filter-mssql_lookup-0.1.5.jar
 - config/checkstyle/checkstyle.xml
 - config/checkstyle/default.xml
 - example/mssql-filter-lookup_testing.yml.liquid