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

Count Fixes

Browse Source
This commit is contained in:
Hein 2025-11-07 13:54:24 +02:00
parent 2e9a0bd51a
commit abee5c942f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/common/adapters/database/bun.go
View File

@ -228,7 +228,10 @@ func (b *BunSelectQuery) Scan(ctx context.Context, dest interface{}) error {
} }
func (b *BunSelectQuery) Count(ctx context.Context) (int, error) { func (b *BunSelectQuery) Count(ctx context.Context) (int, error) {
count, err := b.query.Count(ctx) // Use ColumnExpr with Scan instead of Count() to avoid requiring a model
// This works with just Table() set and avoids "Model(nil)" error
var count int
err := b.query.ColumnExpr("count(*)").Scan(ctx, &count)
return count, err return count, err
} }

8
pkg/resolvespec/handler.go
View File

@ -171,13 +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)
// Create the model pointer early for Bun compatibility // Create the model pointer for Scan() operations
// Bun requires Model() to be set for Count() and Scan() operations // We don't set it on the query to avoid table duplication in FROM clause
sliceType := reflect.SliceOf(reflect.PointerTo(modelType)) sliceType := reflect.SliceOf(reflect.PointerTo(modelType))
modelPtr := reflect.New(sliceType).Interface() modelPtr := reflect.New(sliceType).Interface()
// Use Model() and Table() - Bun needs both for proper operation // Use only Table() - model will be provided to Scan() directly
query := h.db.NewSelect().Model(modelPtr).Table(tableName) query := h.db.NewSelect().Table(tableName)
// Apply column selection // Apply column selection
if len(options.Columns) > 0 { if len(options.Columns) > 0 {

6
pkg/restheadspec/handler.go
View File

@ -201,9 +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 and Model() for Bun compatibility // Use Table() with the resolved table name
// Bun requires Model() to be set for Count() and Scan() operations // Model will be provided to Scan() directly to avoid table duplication in FROM clause
query := h.db.NewSelect().Model(modelPtr).Table(tableName) query := h.db.NewSelect().Table(tableName)
// Apply column selection // Apply column selection
if len(options.Columns) > 0 { if len(options.Columns) > 0 {