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

Fixing add when there is no node match #2325

Browse Source
This commit is contained in:
Mike Farah 2025-03-25 15:34:01 +11:00
parent 1395d6e230
commit 337960a6d1
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/yqlib/operator_add.go
View File

@ -39,13 +39,19 @@ func toNodes(candidate *CandidateNode, lhs *CandidateNode) []*CandidateNode {
func addOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) { func addOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
log.Debugf("Add operator") log.Debugf("Add operator")
return crossFunction(d, context.ReadOnlyClone(), expressionNode, add, false) return crossFunction(d, context.ReadOnlyClone(), expressionNode, add, true)
} }
func add(_ *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) { func add(_ *dataTreeNavigator, context Context, lhs *CandidateNode, rhs *CandidateNode) (*CandidateNode, error) {
lhsNode := lhs lhsNode := lhs
if lhsNode.Tag == "!!null" { if lhs == nil && rhs == nil {
return nil, nil
} else if lhs == nil {
return rhs.Copy(), nil
} else if rhs == nil {
return lhs.Copy(), nil
} else if lhsNode.Tag == "!!null" {
return lhs.CopyAsReplacement(rhs), nil return lhs.CopyAsReplacement(rhs), nil
} }

9
pkg/yqlib/operator_add_test.go
View File

@ -310,6 +310,15 @@ 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: "Add to empty",
subdescription: "should behave like null",
expression: `.nada + "cat"`,
expected: []string{
"D0, P[], (!!str)::cat\n",
},
},
{ {
description: "Add to null", description: "Add to null",
subdescription: "Adding to null simply returns the rhs", subdescription: "Adding to null simply returns the rhs",