wdevs/ResolveSpec
3
0
Fork 0
mirror of https://github.com/bitechdev/ResolveSpec.git synced 2025-11-13 09:53:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better model pointers

Browse Source
This commit is contained in:
Hein 2025-11-07 13:45:08 +02:00
parent f518a3c73c
commit 2e9a0bd51a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/resolvespec/handler.go
View File

@ -171,8 +171,13 @@ func (h *Handler) handleRead(ctx context.Context, w common.ResponseWriter, id st
logger.Info("Reading records from %s.%s", schema, entity) logger.Info("Reading records from %s.%s", schema, entity)
// Use Table() with the resolved table name (don't use Model() as it would add the table twice) // Create the model pointer early for Bun compatibility
query := h.db.NewSelect().Table(tableName) // Bun requires Model() to be set for Count() and Scan() operations
sliceType := reflect.SliceOf(reflect.PointerTo(modelType))
modelPtr := reflect.New(sliceType).Interface()
// Use Model() and Table() - Bun needs both for proper operation
query := h.db.NewSelect().Model(modelPtr).Table(tableName)
// Apply column selection // Apply column selection
if len(options.Columns) > 0 { if len(options.Columns) > 0 {
@ -224,7 +229,7 @@ func (h *Handler) handleRead(ctx context.Context, w common.ResponseWriter, id st
var result interface{} var result interface{}
if id != "" { if id != "" {
logger.Debug("Querying single record with ID: %s", id) logger.Debug("Querying single record with ID: %s", id)
// Create a pointer to the struct type for scanning - use modelType which is already unwrapped // For single record, create a new pointer to the struct type
singleResult := reflect.New(modelType).Interface() singleResult := reflect.New(modelType).Interface()
query = query.Where("id = ?", id) query = query.Where("id = ?", id)
if err := query.Scan(ctx, singleResult); err != nil { if err := query.Scan(ctx, singleResult); err != nil {
@ -235,16 +240,13 @@ func (h *Handler) handleRead(ctx context.Context, w common.ResponseWriter, id st
result = singleResult result = singleResult
} else { } else {
logger.Debug("Querying multiple records") logger.Debug("Querying multiple records")
// Create a slice of pointers to the model type - use modelType which is already unwrapped // Use the modelPtr already created and set on the query
sliceType := reflect.SliceOf(reflect.PointerTo(modelType)) if err := query.Scan(ctx, modelPtr); err != nil {
results := reflect.New(sliceType).Interface()
if err := query.Scan(ctx, results); err != nil {
logger.Error("Error querying records: %v", err) logger.Error("Error querying records: %v", err)
h.sendError(w, http.StatusInternalServerError, "query_error", "Error executing query", err) h.sendError(w, http.StatusInternalServerError, "query_error", "Error executing query", err)
return return
} }
result = reflect.ValueOf(results).Elem().Interface() result = reflect.ValueOf(modelPtr).Elem().Interface()
} }
logger.Info("Successfully retrieved records") logger.Info("Successfully retrieved records")

5
pkg/restheadspec/handler.go
View File

@ -201,8 +201,9 @@ func (h *Handler) handleRead(ctx context.Context, w common.ResponseWriter, id st
logger.Info("Reading records from %s.%s", schema, entity) logger.Info("Reading records from %s.%s", schema, entity)
// Use Table() with the resolved table name (don't use Model() as it would add the table twice) // Use Table() with the resolved table name and Model() for Bun compatibility
query := h.db.NewSelect().Table(tableName) // Bun requires Model() to be set for Count() and Scan() operations
query := h.db.NewSelect().Model(modelPtr).Table(tableName)
// Apply column selection // Apply column selection
if len(options.Columns) > 0 { if len(options.Columns) > 0 {