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

Default value should not be nil #2995

Merged
merged 7 commits into from
Feb 14, 2019
Merged

Default value should not be nil #2995

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1071863
query/query.go: default value should not be nil
Feb 8, 2019
06b1de8
query/query.go: retract default value change it breaks aggs.
Feb 8, 2019
68d65e9
types/conversion.go: add exception in Marshal for default->string
Feb 8, 2019
a1128e5
wrong issue referenced in comments
Feb 8, 2019
4501a71
types/conversion.go: general case in nil value mashaling
Feb 12, 2019
61b9f90
types/conversion.go: replace the original to-value
Feb 12, 2019
aeb058d
types/conversion.go: added check for Marshal to nil object
Feb 14, 2019
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
11 changes: 11 additions & 0 deletions types/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,22 @@ func Convert(from Val, toID TypeID) (Val, error) {
}

func Marshal(from Val, to *Val) error {
if to == nil {
return x.Errorf("Invalid conversion %s to nil", from.Tid.Name())
}

fromID := from.Tid
toID := to.Tid
val := from.Value
res := &to.Value

// This is a default value from sg.fillVars, don't convert it's empty.
// Fixes issue #2980.
if val == nil {
*to = ValueForType(toID)
return nil
}

switch fromID {
case BinaryID:
vc := val.([]byte)
Expand Down