From 0c56cc143e7dc0ba583114c3f50bce35035007a9 Mon Sep 17 00:00:00 2001
From: Simon Martin <simon@nasilyan.com>
Date: Wed, 4 Feb 2026 10:37:33 +0000
Subject: [PATCH] model: support unmarshalling RIDs from string

hub stores list/repo/tracker RIDs as strings in its database, and I want
to return those as GQL IDs, not strings, in the upcoming GQL API. This
is not possible without this patch since those strings are not UUIDs but
marshalled ones.

Signed-off-by: Simon Martin <simon@nasilyan.com>
---
 model/rid.go | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/model/rid.go b/model/rid.go
index 15b12401c1b25318da82093d7b27033ff9665874..8af5a9d67e517b9ac8605f23aaec173c3e38bacc 100644
--- a/model/rid.go
+++ b/model/rid.go
@@ -44,18 +44,22 @@ func (rid RID) MarshalGQL(w io.Writer) {
 	w.Write(fmt.Appendf(nil, `"%s"`, rid.String()))
 }
 
+func (rid *RID) unmarshalString(s string) error {
+	bytes, err := base32Encoding.DecodeString(s)
+	if err != nil {
+		return err
+	}
+	rid.uuid, err = uuid.FromBytes(bytes)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (rid *RID) UnmarshalGQL(v any) error {
 	switch v := v.(type) {
 	case string:
-		bytes, err := base32Encoding.DecodeString(v)
-		if err != nil {
-			return err
-		}
-		rid.uuid, err = uuid.FromBytes(bytes)
-		if err != nil {
-			return err
-		}
-		return nil
+		return rid.unmarshalString(v)
 	default:
 		return fmt.Errorf("%T is not a valid RID", v)
 	}
@@ -63,13 +67,18 @@ func (rid *RID) UnmarshalGQL(v any) error {
 
 // database/sql.Scanner
 func (rid *RID) Scan(src any) error {
-	var uuid uuid.UUID
-	err := uuid.Scan(src)
-	if err != nil {
-		return err
+	switch src := src.(type) {
+	case string:
+		return rid.unmarshalString(src)
+	default:
+		var uuid uuid.UUID
+		err := uuid.Scan(src)
+		if err != nil {
+			return err
+		}
+		rid.uuid = uuid
+		return nil
 	}
-	rid.uuid = uuid
-	return nil
 }
 
 // database/sql/driver.Valuer