This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/main by this push:
new a1f80f7962 Fix #4057 - MSSQL Bulk Load Action: manage connection
through variables (#6181)
a1f80f7962 is described below
commit a1f80f79627fb4829773e8a34150dfb4cacb009a
Author: Sergio Ramazzina <[email protected]>
AuthorDate: Fri Dec 12 05:11:04 2025 +0100
Fix #4057 - MSSQL Bulk Load Action: manage connection through variables
(#6181)
---
.../hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java | 9 ++-------
.../actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java | 3 ++-
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git
a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
index 85449b545c..21c7a36070 100644
---
a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
+++
b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoad.java
@@ -34,7 +34,6 @@ import org.apache.hop.core.database.DatabaseMeta;
import org.apache.hop.core.exception.HopDatabaseException;
import org.apache.hop.core.exception.HopException;
import org.apache.hop.core.exception.HopFileException;
-import org.apache.hop.core.exception.HopXmlException;
import org.apache.hop.core.util.Utils;
import org.apache.hop.core.variables.IVariables;
import org.apache.hop.core.vfs.HopVfs;
@@ -237,7 +236,7 @@ public class ActionMssqlBulkLoad extends ActionBase {
if (connection != null) {
- DatabaseMeta dbMeta =
DatabaseMeta.loadDatabase(getMetadataProvider(), connection);
+ DatabaseMeta dbMeta = parentWorkflowMeta.findDatabase(connection,
getVariables());
// User has specified a connection, We can continue ...
String pluginId = dbMeta.getPluginId();
@@ -491,11 +490,7 @@ public class ActionMssqlBulkLoad extends ActionBase {
ResourceReference reference = null;
DatabaseMeta dbMeta = null;
if (connection != null) {
- try {
- dbMeta = DatabaseMeta.loadDatabase(getMetadataProvider(), connection);
- } catch (HopXmlException e) {
- logError("Error loading connection", e);
- }
+ dbMeta = parentWorkflowMeta.findDatabase(connection, getVariables());
reference = new ResourceReference(this);
references.add(reference);
reference.getEntries().add(new ResourceEntry(dbMeta.getHostname(),
ResourceType.SERVER));
diff --git
a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
index a20886fac7..b779fc3305 100644
---
a/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
+++
b/plugins/actions/mssqlbulkload/src/main/java/org/apache/hop/workflow/actions/mssqlbulkload/ActionMssqlBulkLoadDialog.java
@@ -224,7 +224,8 @@ public class ActionMssqlBulkLoadDialog extends ActionDialog
{
wConnectionGroup.setLayout(connectionGroupLayout);
// Connection line
- wConnection = addConnectionLine(wConnectionGroup, wName,
action.getConnection(), lsMod);
+ DatabaseMeta databaseMeta =
workflowMeta.findDatabase(action.getConnection(), variables);
+ wConnection = addConnectionLine(wConnectionGroup, wName, databaseMeta,
lsMod);
// Schema name line
// Schema name