Merge pull request #58 from nanjj/sqlscan

Change (*UUID) Scan to accept type UUID argument

sql.go

@@ -38,6 +38,10 @@ func (u UUID) Value() (driver.Value, error) {
 // a longer byte slice or a string will be handled by UnmarshalText.
 func (u *UUID) Scan(src interface{}) error {
 	switch src := src.(type) {
+	case UUID: // support gorm convert from UUID to NullUUID
+		*u = src
+		return nil
+
 	case []byte:
 		if len(src) == Size {
 			return u.UnmarshalBinary(src)

sql_test.go

@@ -118,6 +118,7 @@ func TestNullUUID(t *testing.T) {
 	t.Run("Scan", func(t *testing.T) {
 		t.Run("Nil", testNullUUIDScanNil)
 		t.Run("Valid", testNullUUIDScanValid)
+		t.Run("UUID", testNullUUIDScanUUID)
 	})
 
 	t.Run("MarshalJSON", func(t *testing.T) {
@@ -193,6 +194,20 @@ func testNullUUIDScanValid(t *testing.T) {
 	}
 }
 
+func testNullUUIDScanUUID(t *testing.T) {
+	u := NullUUID{}
+	err := u.Scan(codecTestUUID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !u.Valid {
+		t.Errorf("Valid == false after scan(%v)", codecTestUUID)
+	}
+	if u.UUID != codecTestUUID {
+		t.Errorf("UUID == %v after Scan(%v), want %v", u.UUID, codecTestUUID, codecTestUUID)
+	}
+}
+
 func testNullUUIDMarshalJSONNil(t *testing.T) {
 	u := NullUUID{Valid: true}