tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Amit Basuri 2020-10-30 17:20:00 +05:30 committed by GitHub
commit 0c71c43a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soft_delete.go
View File

@ -26,11 +26,11 @@ func (n DeletedAt) Value() (driver.Value, error) {
} }
func (n DeletedAt) MarshalJSON() ([]byte, error) { func (n DeletedAt) MarshalJSON() ([]byte, error) {
if !n.Valid { if n.Valid {
return []byte(`null`), nil
}
return json.Marshal(n.Time) return json.Marshal(n.Time)
} }
return json.Marshal(nil)
}
func (n *DeletedAt) UnmarshalJSON(b []byte) error { func (n *DeletedAt) UnmarshalJSON(b []byte) error {
if string(b) == "null" { if string(b) == "null" {