Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions bun/bunpaginate/pagination_column.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,32 @@ func findPaginationFieldPath(v any, paginationColumn string) []reflect.StructFie
typeOfT := reflect.TypeOf(v)
for i := 0; i < typeOfT.NumField(); i++ {
field := typeOfT.Field(i)
switch field.Type.Kind() {
fieldType := field.Type

// If the field is a pointer, we unreference it to target the concrete type
// For example:
// type Object struct {
// *AnotherObject
// }
for {
if field.Type.Kind() == reflect.Ptr {
fieldType = field.Type.Elem()
}
break
}

switch fieldType.Kind() {
case reflect.Struct:
if field.Type.AssignableTo(reflect.TypeOf(time.Time{})) ||
field.Type.AssignableTo(reflect.TypeOf(&time.Time{})) ||
field.Type.AssignableTo(reflect.TypeOf(libtime.Time{})) ||
field.Type.AssignableTo(reflect.TypeOf(&libtime.Time{})) {
if fieldType.AssignableTo(reflect.TypeOf(time.Time{})) ||
fieldType.AssignableTo(reflect.TypeOf(libtime.Time{})) ||
fieldType.AssignableTo(reflect.TypeOf(big.Int{})) ||
fieldType.AssignableTo(reflect.TypeOf(BigInt{})) {

if fields := checkTag(field, paginationColumn); len(fields) > 0 {
return fields
}
} else {
fields := findPaginationFieldPath(reflect.New(field.Type).Elem().Interface(), paginationColumn)
fields := findPaginationFieldPath(reflect.New(fieldType).Elem().Interface(), paginationColumn)
if len(fields) > 0 {
return fields
}
Expand Down Expand Up @@ -163,8 +177,12 @@ func findPaginationField(v any, fields ...reflect.StructField) *big.Int {
return big.NewInt(rawPaginationID.UTC().UnixMicro())
case *BigInt:
return (*big.Int)(rawPaginationID)
case BigInt:
return (*big.Int)(&rawPaginationID)
case *big.Int:
return rawPaginationID
case big.Int:
return &rawPaginationID
case int64:
return big.NewInt(rawPaginationID)
case int:
Expand Down
Loading