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 9bc8b7ac02 fix failing tests, fixes #6252 (#6253)
9bc8b7ac02 is described below
commit 9bc8b7ac025067dd43c67e03122f7bf214be45e0
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Wed Dec 24 11:56:49 2025 +0100
fix failing tests, fixes #6252 (#6253)
---
.../transforms/datasets/golden-file-metadata.csv | 25 ++++++++++++----------
.../workflow/actions/pipeline/ActionPipeline.java | 13 +++++++----
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/integration-tests/transforms/datasets/golden-file-metadata.csv
b/integration-tests/transforms/datasets/golden-file-metadata.csv
index 70cac97ca6..8d0a5c5623 100644
--- a/integration-tests/transforms/datasets/golden-file-metadata.csv
+++ b/integration-tests/transforms/datasets/golden-file-metadata.csv
@@ -1,11 +1,14 @@
-charset,delimiter,enclosure,field_count,skip_header_lines,skip_footer_lines,header_line_present,name,type,length,precision,mask,decimal_symbol,grouping_symbol
-US-ASCII,;,,10,0,0,Y,id,Integer,15,0," #",.,","
-US-ASCII,;,,10,0,0,Y,name,String,10,,,.,","
-US-ASCII,;,,10,0,0,Y,firstname,String,13,,,.,","
-US-ASCII,;,,10,0,0,Y,zip,Integer,15,0," #",.,","
-US-ASCII,;,,10,0,0,Y,city,String,8,,,.,","
-US-ASCII,;,,10,0,0,Y,birthdate,Date,,,yyyy/MM/dd,.,","
-US-ASCII,;,,10,0,0,Y,street,String,11,,,.,","
-US-ASCII,;,,10,0,0,Y,housenr,Integer,15,0," #",.,","
-US-ASCII,;,,10,0,0,Y,stateCode,String,9,,,.,","
-US-ASCII,;,,10,0,0,Y,state,String,30,,,.,","
+charset,delimiter,enclosure,field_count,skip_header_lines,skip_footer_lines,header_line_present,name,type,length,precision,mask,decimal_symbol,grouping_symbol
+US-ASCII,;,"""",13,0,0,Y,id,Integer,15,0," #",",",.
+US-ASCII,;,"""",13,0,0,Y,name,String,10,,,",",.
+US-ASCII,;,"""",13,0,0,Y,firstname,String,13,,,",",.
+US-ASCII,;,"""",13,0,0,Y,zip,Integer,15,0," #",",",.
+US-ASCII,;,"""",13,0,0,Y,city,String,8,,,",",.
+US-ASCII,;,"""",13,0,0,Y,birthdate,Date,,,yyyy/MM/dd,",",.
+US-ASCII,;,"""",13,0,0,Y,street,String,11,,,",",.
+US-ASCII,;,"""",13,0,0,Y,housenr,Integer,15,0," #",",",.
+US-ASCII,;,"""",13,0,0,Y,stateCode,String,9,,,",",.
+US-ASCII,;,"""",13,0,0,Y,state,String,30,,,",",.
+US-ASCII,;,"""",13,0,0,Y,isActive,Boolean,,,,",",.
+US-ASCII,;,"""",13,0,0,Y,registrationTimestamp,Date,,,yyyy-MM-dd
HH:mm:ss.SSS,",",.
+US-ASCII,;,"""",13,0,0,Y,metadataJson,String,64,,,",",.
diff --git
a/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java
b/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java
index ff329b54dd..9d80e862af 100644
---
a/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java
+++
b/plugins/actions/pipeline/src/main/java/org/apache/hop/workflow/actions/pipeline/ActionPipeline.java
@@ -519,6 +519,9 @@ public class ActionPipeline extends ActionBase implements
Cloneable, IAction {
pipeline.copyParametersFromDefinitions(pipelineMeta);
// Pass the parameter values and activate...
+ // Note: getValues() returns unresolved values, which will be resolved
once in
+ // activateParams()
+ // We must NOT resolve them here to avoid double resolution
//
TransformWithMappingMeta.activateParams(
pipeline,
@@ -849,8 +852,11 @@ public class ActionPipeline extends ActionBase implements
Cloneable, IAction {
// parameter.getValue()
//
String thisValue = namedParam.getParameterValue(parameter.getName());
- // Set value only if is not empty at namedParam and exists in
parameter.getField
+ // Only set variables for field-based parameters, not for value-based
parameters
+ // Value-based parameters will be passed directly and should not be set
as variables
+ // to avoid double resolution issues in activateParams()
if (!Utils.isEmpty(Const.trim(parameter.getField()))) {
+ // Field-based parameter: set as variable so it can be used in the
pipeline
// If is not empty then we have to ask if it exists too in
parameter.getValue(), since
// the values in parameter.getValue() prevail over parameterFieldNames
// If is empty at parameter.getValue(), then we can finally add that
variable with that
@@ -858,10 +864,9 @@ public class ActionPipeline extends ActionBase implements
Cloneable, IAction {
if (Utils.isEmpty(Const.trim(parameter.getValue()))) {
actionPipeline.setVariable(parameter.getName(), Const.NVL(thisValue,
""));
}
- } else {
- // Or if not in parameter.getValue() then we can add that variable
with that value too
- actionPipeline.setVariable(parameter.getName(), Const.NVL(thisValue,
""));
}
+ // For value-based parameters (those with parameter.getValue() set), do
NOT set as variable
+ // They will be passed as parameters and resolved in activateParams()
}
}
