(hop) branch main updated: Issue #5694 (bug fix) (#5695)

[hansva]

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 7758ffd147 Issue #5694 (bug fix) (#5695)
7758ffd147 is described below

commit 7758ffd147204c23f8f52e922a48730820a4015e
Author: Matt Casters <mattcast...@gmail.com>
AuthorDate: Tue Sep 9 11:01:55 2025 +0200

    Issue #5694 (bug fix) (#5695)
    
    Co-authored-by: Matt Casters <matt.cast...@vdab.be>
---
 .../transforms/metadata/dataset/golden-merge-rows-diff.json        | 4 ++--
 .../apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java    | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/integration-tests/transforms/metadata/dataset/golden-merge-rows-diff.json 
b/integration-tests/transforms/metadata/dataset/golden-merge-rows-diff.json
index ca0feaf854..f83fef41f6 100644
--- a/integration-tests/transforms/metadata/dataset/golden-merge-rows-diff.json
+++ b/integration-tests/transforms/metadata/dataset/golden-merge-rows-diff.json
@@ -32,7 +32,7 @@
       "field_length": -1,
       "field_type": 2,
       "field_precision": -1,
-      "field_name": "flagfield",
+      "field_name": "difference",
       "field_format": ""
     },
     {
@@ -40,7 +40,7 @@
       "field_length": -1,
       "field_type": 2,
       "field_precision": -1,
-      "field_name": "difference",
+      "field_name": "flagfield",
       "field_format": ""
     }
   ],
diff --git 
a/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
 
b/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
index c784972431..280ac0f9b0 100644
--- 
a/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
+++ 
b/plugins/transforms/mergerows/src/main/java/org/apache/hop/pipeline/transforms/mergerows/MergeRowsMeta.java
@@ -159,15 +159,14 @@ public class MergeRowsMeta extends 
BaseTransformMeta<MergeRows, MergeRowsData> {
       throw new HopTransformException(
           BaseMessages.getString(PKG, 
"MergeRowsMeta.Exception.FlagFieldNotSpecified"));
     }
-    IValueMeta flagFieldValue = new ValueMetaString(flagField);
-    flagFieldValue.setOrigin(name);
-    r.addValueMeta(flagFieldValue);
-
     if (StringUtils.isNotEmpty(variables.resolve(diffJsonField))) {
       IValueMeta diffField = new 
ValueMetaString(variables.resolve(diffJsonField));
       diffField.setOrigin(name);
       r.addValueMeta(diffField);
     }
+    IValueMeta flagFieldValue = new ValueMetaString(flagField);
+    flagFieldValue.setOrigin(name);
+    r.addValueMeta(flagFieldValue);
   }
 
   @Override