Move the custom nil-checking logic to decodeCursor

pilagod · Feb 16, 2024 · 82daeea · 82daeea
1 parent 8ff8a42
commit 82daeea
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/paginator/paginator.go b/paginator/paginator.go
@@ -192,7 +192,19 @@ func (p *Paginator) decodeCursor(dest interface{}) (result []interface{}, err er
 	}
 	// replace null values
 	for i := range result {
-		if isNil(result[i]) {
+		var isNullValue bool
+		// for custom types, evaluate isNil on the underlying value
+		if ct, ok := result[i].(cursor.CustomType); ok && p.rules[i].CustomType != nil {
+			val, valErr := ct.GetCustomTypeValue(p.rules[i].CustomType.Meta)
+			if valErr != nil {
+				err = valErr
+			}
+			isNullValue = isNil(val)
+		} else {
+			isNullValue = isNil(result[i])
+		}
+
+		if isNullValue {
 			result[i] = p.rules[i].NULLReplacement
 		}
 	}