[incubator-hop] branch master updated: HOP-2671: add parameter resolve

[hansva]

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 4760e45  HOP-2671: add parameter resolve
     new b32bda3  Merge pull request #797 from hansva/master
4760e45 is described below

commit 4760e45561a5de2e4f1c4b88f73ba2e11e8863da
Author: Hans Van Akelyen <hans.van.akel...@gmail.com>
AuthorDate: Fri May 7 23:40:22 2021 +0200

    HOP-2671: add parameter resolve
---
 .../transforms/monetdbbulkloader/MonetDbBulkLoader.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoader.java
 
b/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoader.java
index 240c301..953d39a 100644
--- 
a/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoader.java
+++ 
b/plugins/transforms/monetdbbulkloader/src/main/java/org/apache/hop/pipeline/transforms/monetdbbulkloader/MonetDbBulkLoader.java
@@ -436,12 +436,9 @@ public class MonetDbBulkLoader extends 
BaseTransform<MonetDbBulkLoaderMeta, Mone
           .append(data.quote)
           .append("' NULL AS '" + nullRep + "';");
       String cmd = cmdBuff.toString();
-      if (log.isDetailed()) {
-        logDetailed(cmd);
-      }
 
       // See if we need to execute extra SQL statements...
-      //
+
       String sql = dm.getConnectSql();
 
       // only execute if the SQL is not empty, null and is not just a bunch of
@@ -450,7 +447,10 @@ public class MonetDbBulkLoader extends 
BaseTransform<MonetDbBulkLoaderMeta, Mone
         String[] sqlStatements = sql.split(";");
         for (String statement : sqlStatements) {
           data.out.write('s');
-          data.out.write(statement);
+          data.out.write(resolve(statement));
+          if (log.isDetailed()) {
+            logDetailed(resolve(statement));
+          }
           data.out.write(';');
           data.out.newLine();
         }
@@ -458,6 +458,9 @@ public class MonetDbBulkLoader extends 
BaseTransform<MonetDbBulkLoaderMeta, Mone
         data.out.write('s');
       }
 
+      if (log.isDetailed()) {
+        logDetailed(cmd);
+      }
       data.out.write(cmdBuff.toString());
       data.out.newLine();