From f54936467101bb08bbdf7f3d9c341134c06b83c3 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 16 Dec 2015 15:49:04 -0500 Subject: Updating go dependancies --- Godeps/_workspace/src/github.com/pborman/uuid/sql.go | 18 +++++++++++++----- .../_workspace/src/github.com/pborman/uuid/sql_test.go | 5 +++++ 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'Godeps/_workspace/src/github.com/pborman') 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) } diff --git a/Godeps/_workspace/src/github.com/pborman/uuid/sql_test.go b/Godeps/_workspace/src/github.com/pborman/uuid/sql_test.go index d643567ee..83bac8cac 100644 --- a/Godeps/_workspace/src/github.com/pborman/uuid/sql_test.go +++ b/Godeps/_workspace/src/github.com/pborman/uuid/sql_test.go @@ -22,6 +22,11 @@ func TestScan(t *testing.T) { t.Fatal(err) } + err = (&uuid).Scan([]byte(stringTest)) + if err != nil { + t.Fatal(err) + } + err = (&uuid).Scan(byteTest) if err != nil { t.Fatal(err) -- cgit v1.2.3-1-g7c22