Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make "OverwriteWithEmptyValue" in config struct to be set by any method. #133

Merged
merged 6 commits into from
Jan 17, 2020
Merged

Make "OverwriteWithEmptyValue" in config struct to be set by any method. #133

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70f83ab
Make "OverwriteWithEmptyValue" in config struct to be set by any method.
komalsinha-g Jan 16, 2020
f1251f8
Update map.go
komalsinha-g Jan 16, 2020
b04021a
Update merge.go
komalsinha-g Jan 16, 2020
fbd898a
Update map.go
komalsinha-g Jan 16, 2020
b947004
Update merge.go
komalsinha-g Jan 16, 2020
4f81537
Update merge.go
komalsinha-g Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, conf
case reflect.Struct:
srcMap := src.Interface().(map[string]interface{})
for key := range srcMap {
config.overwriteWithEmptyValue = true
config.OverwriteWithEmptyValue = true
srcValue := srcMap[key]
fieldName := changeInitialCase(key, unicode.ToUpper)
dstElement := dst.FieldByName(fieldName)
Expand Down
10 changes: 7 additions & 3 deletions merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type Config struct {
AppendSlice bool
TypeCheck bool
Transformers Transformers
overwriteWithEmptyValue bool
OverwriteWithEmptyValue bool
komalsinha-g marked this conversation as resolved.
Show resolved Hide resolved
overwriteSliceWithEmptyValue bool
}

Expand All @@ -44,9 +44,8 @@ type Transformers interface {
func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, config *Config) (err error) {
overwrite := config.Overwrite
typeCheck := config.TypeCheck
overwriteWithEmptySrc := config.overwriteWithEmptyValue
overwriteWithEmptySrc := config.OverwriteWithEmptyValue
overwriteSliceWithEmptySrc := config.overwriteSliceWithEmptyValue
config.overwriteWithEmptyValue = false
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is forced true in https://github.com/imdario/mergo/blob/master/map.go#L75

by dropping the reset to false, any merge involving a map leaves this value set to true after merging the map.


if !src.IsValid() {
return
Expand Down Expand Up @@ -246,6 +245,11 @@ func WithOverride(config *Config) {
config.Overwrite = true
}

// WithOverwriteWithEmptyValue will make merge override non empty dst attributes with empty src attributes values.
func WithOverwriteWithEmptyValue(config *Config) {
config.OverwriteWithEmptyValue = true
}

// WithOverride will make merge override empty dst slice with empty src slice.
func WithOverrideEmptySlice(config *Config) {
config.overwriteSliceWithEmptyValue = true
Expand Down