From 8723855d957fc7a076a0e6998a016d8c4b138dca Mon Sep 17 00:00:00 2001 From: Konstantin Grachev Date: Wed, 9 Oct 2024 14:22:10 +0300 Subject: [PATCH] Implement pgtype.UUID.String() --- pgtype/uuid.go | 8 ++++++++ pgtype/uuid_test.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/pgtype/uuid.go b/pgtype/uuid.go index d57c0f2fa..0628f193f 100644 --- a/pgtype/uuid.go +++ b/pgtype/uuid.go @@ -96,6 +96,14 @@ func (src UUID) Value() (driver.Value, error) { return encodeUUID(src.Bytes), nil } +func (src UUID) String() string { + if !src.Valid { + return "" + } + + return encodeUUID(src.Bytes) +} + func (src UUID) MarshalJSON() ([]byte, error) { if !src.Valid { return []byte("null"), nil diff --git a/pgtype/uuid_test.go b/pgtype/uuid_test.go index 1c701e747..255bd92f6 100644 --- a/pgtype/uuid_test.go +++ b/pgtype/uuid_test.go @@ -63,6 +63,38 @@ func TestUUIDCodec(t *testing.T) { }) } +func TestUUID_String(t *testing.T) { + tests := []struct { + name string + src pgtype.UUID + want string + }{ + { + name: "first", + src: pgtype.UUID{ + Bytes: [16]byte{29, 72, 90, 122, 109, 24, 69, 153, 140, 108, 52, 66, 86, 22, 136, 122}, + Valid: true, + }, + want: "1d485a7a-6d18-4599-8c6c-34425616887a", + }, + { + name: "third", + src: pgtype.UUID{ + Bytes: [16]byte{}, + }, + want: "", + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got := tt.src.String() + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("MarshalJSON() got = %v, want %v", got, tt.want) + } + }) + } +} + func TestUUID_MarshalJSON(t *testing.T) { tests := []struct { name string