diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-16 13:43:02 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-16 13:43:02 -0800 |
commit | 791129de2fa7db22ee2b23b97d4040c288110e97 (patch) | |
tree | 5976a456548fce8beb79014c7c2780afeea89a8a /Godeps/_workspace/src/github.com/pborman/uuid/sql.go | |
parent | f08deca79f24ff1efe086483a091cf807a5a2e14 (diff) | |
parent | f54936467101bb08bbdf7f3d9c341134c06b83c3 (diff) | |
download | chat-791129de2fa7db22ee2b23b97d4040c288110e97.tar.gz chat-791129de2fa7db22ee2b23b97d4040c288110e97.tar.bz2 chat-791129de2fa7db22ee2b23b97d4040c288110e97.zip |
Merge pull request #1742 from mattermost/update-golang-deps
Updating go dependancies
Diffstat (limited to 'Godeps/_workspace/src/github.com/pborman/uuid/sql.go')
-rw-r--r-- | Godeps/_workspace/src/github.com/pborman/uuid/sql.go | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go b/Godeps/_workspace/src/github.com/pborman/uuid/sql.go index 2d7679e2a..98b23aa15 100644 --- a/Godeps/_workspace/src/github.com/pborman/uuid/sql.go +++ b/Godeps/_workspace/src/github.com/pborman/uuid/sql.go @@ -24,14 +24,22 @@ func (uuid *UUID) Scan(src interface{}) error { *uuid = parsed case []byte: - // assumes a simple slice of bytes, just check validity and store - u := UUID(src.([]byte)) + b := src.([]byte) - if u.Variant() == Invalid { - return errors.New("Scan: invalid UUID format") + // assumes a simple slice of bytes if 16 bytes + // otherwise attempts to parse + if len(b) == 16 { + *uuid = UUID(b) + } else { + u := Parse(string(b)) + + if u == nil { + return errors.New("Scan: invalid UUID format") + } + + *uuid = u } - *uuid = u default: return fmt.Errorf("Scan: unable to scan type %T into UUID", src) } |