From 69cc3e283964f875702b33b50b266529a215a159 Mon Sep 17 00:00:00 2001
From: Hein <hein@bitechsystems.co.za>
Date: Wed, 27 May 2026 14:11:20 +0200
Subject: [PATCH] fix(db): update Returning method to accept multiple columns

---
 pkg/common/adapters/database/bun.go | 4 ++--
 pkg/restheadspec/handler.go         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/common/adapters/database/bun.go b/pkg/common/adapters/database/bun.go
index ba3dc62..236d60b 100644
--- a/pkg/common/adapters/database/bun.go
+++ b/pkg/common/adapters/database/bun.go
@@ -1489,7 +1489,7 @@ func (b *BunInsertQuery) OnConflict(action string) common.InsertQuery {
 
 func (b *BunInsertQuery) Returning(columns ...string) common.InsertQuery {
 	if len(columns) > 0 {
-		b.query = b.query.Returning(columns[0])
+		b.query = b.query.Returning(strings.Join(columns, ", "))
 	}
 	return b
 }
@@ -1606,7 +1606,7 @@ func (b *BunUpdateQuery) Where(query string, args ...interface{}) common.UpdateQ
 
 func (b *BunUpdateQuery) Returning(columns ...string) common.UpdateQuery {
 	if len(columns) > 0 {
-		b.query = b.query.Returning(columns[0])
+		b.query = b.query.Returning(strings.Join(columns, ", "))
 	}
 	return b
 }
diff --git a/pkg/restheadspec/handler.go b/pkg/restheadspec/handler.go
index d494e15..99fa00d 100644
--- a/pkg/restheadspec/handler.go
+++ b/pkg/restheadspec/handler.go
@@ -1218,8 +1218,8 @@ func (h *Handler) handleCreate(ctx context.Context, w common.ResponseWriter, dat
 			if provider, ok := modelValue.(common.TableNameProvider); !ok || provider.TableName() == "" {
 				query = query.Table(tableName)
 			}
-
-			query = query.Returning("*")
+			fields := reflection.GetSQLModelColumns(model)
+			query = query.Returning(fields...)
 
 			// Execute BeforeScan hooks - pass query chain so hooks can modify it
 			itemHookCtx := &HookContext{