merge.Override: Fix handling of dyn.NilValue

databricks · Jun 26, 2024 · 27e26d6 · 27e26d6
1 parent 2ec6abf
commit 27e26d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/libs/dyn/merge/override.go b/libs/dyn/merge/override.go
@@ -30,10 +30,6 @@ func Override(leftRoot dyn.Value, rightRoot dyn.Value, visitor OverrideVisitor)
 }
 
 func override(basePath dyn.Path, left dyn.Value, right dyn.Value, visitor OverrideVisitor) (dyn.Value, error) {
-	if left == dyn.NilValue && right == dyn.NilValue {
-		return dyn.NilValue, nil
-	}
-
 	if left.Kind() != right.Kind() {
 		return visitor.VisitUpdate(basePath, left, right)
 	}
@@ -98,9 +94,11 @@ func override(basePath dyn.Path, left dyn.Value, right dyn.Value, visitor Overri
 		} else {
 			return visitor.VisitUpdate(basePath, left, right)
 		}
+	case dyn.KindNil:
+		return left, nil
 	}
 
-	return dyn.InvalidValue, fmt.Errorf("unexpected kind %s", left.Kind())
+	return dyn.InvalidValue, fmt.Errorf("unexpected kind %s at %s", left.Kind(), basePath.String())
 }
 
 func overrideMapping(basePath dyn.Path, leftMapping dyn.Mapping, rightMapping dyn.Mapping, visitor OverrideVisitor) (dyn.Mapping, error) {

diff --git a/libs/dyn/merge/override_test.go b/libs/dyn/merge/override_test.go
@@ -330,9 +330,9 @@ func TestOverride_Primitive(t *testing.T) {
 		{
 			name:     "nil (not updated)",
 			state:    visitorState{},
-			left:     dyn.NilValue,
-			right:    dyn.NilValue,
-			expected: dyn.NilValue,
+			left:     dyn.NilValue.WithLocation(leftLocation),
+			right:    dyn.NilValue.WithLocation(rightLocation),
+			expected: dyn.NilValue.WithLocation(leftLocation),
 		},
 		{
 			name:     "nil (updated)",