suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-07 06:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Regression in #2353, #2359, #2325

Browse Source
This commit is contained in:
Mike Farah 2025-05-09 15:29:44 +10:00
parent 2c7cce0878
commit 2c2487c0bd
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/yqlib/operator_add_test.go
View File

@ -310,6 +310,13 @@ var addOperatorScenarios = []expressionScenario{
"D0, P[], (!!map)::a: !cat Saturday, 15-Dec-01 at 6:00AM GMT\n", "D0, P[], (!!map)::a: !cat Saturday, 15-Dec-01 at 6:00AM GMT\n",
}, },
}, },
{
skipDoc: true,
description: "empty add shouldn't add",
document: `[]`,
expression: `.[] | (.a + "cat")`,
expected: []string{},
},
{ {
skipDoc: true, skipDoc: true,
description: "Add to empty", description: "Add to empty",

2
pkg/yqlib/operators.go
View File

@ -118,7 +118,7 @@ func doCrossFunc(d *dataTreeNavigator, context Context, expressionNode *Expressi
} }
log.Debugf("crossFunction LHS len: %v", lhs.MatchingNodes.Len()) log.Debugf("crossFunction LHS len: %v", lhs.MatchingNodes.Len())
if prefs.CalcWhenEmpty && lhs.MatchingNodes.Len() == 0 { if prefs.CalcWhenEmpty && context.MatchingNodes.Len() > 0 && lhs.MatchingNodes.Len() == 0 {
err := resultsForRHS(d, context, nil, prefs, expressionNode.RHS, results) err := resultsForRHS(d, context, nil, prefs, expressionNode.RHS, results)
if err != nil { if err != nil {
return Context{}, err return Context{}, err

1
project-words.txt
View File

@ -256,3 +256,4 @@ tonumber
noyaml noyaml
nolint nolint
shortfile shortfile
Unmarshalling