From 7cbe2a07d3090537e0e37549a944096400ab0cde Mon Sep 17 00:00:00 2001
From: "garionion (aider)" <git@entr0py.de>
Date: Fri, 28 Feb 2025 21:18:41 +0100
Subject: [PATCH] refactor: Update SQL queries to explicitly list columns and
 fix import paths

---
 api/api.go                |  2 +-
 api/storage.go            |  2 +-
 database/sqlite/query.sql | 21 +++++++++++----------
 main.go                   |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/api/api.go b/api/api.go
index 84bbfa3..0186f25 100644
--- a/api/api.go
+++ b/api/api.go
@@ -4,7 +4,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	db "github.com/your-username/your-repo/database/sqlite/generated"
+	db "github.com/your-username/your-repo/database/sqlite/generated/sqlite"
 )
 
 // API holds all API handlers
diff --git a/api/storage.go b/api/storage.go
index 8df2f58..5bececa 100644
--- a/api/storage.go
+++ b/api/storage.go
@@ -9,7 +9,7 @@ import (
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 
-	db "github.com/your-username/your-repo/database/sqlite/generated"
+	db "github.com/your-username/your-repo/database/sqlite/generated/sqlite"
 )
 
 type StorageHandler struct {
diff --git a/database/sqlite/query.sql b/database/sqlite/query.sql
index 673f764..5521d86 100644
--- a/database/sqlite/query.sql
+++ b/database/sqlite/query.sql
@@ -1,28 +1,29 @@
 -- name: GetAllUsers :many
-SELECT * FROM users;
+SELECT id, username FROM users;
 
 -- name: GetUserByID :one
-SELECT * FROM users WHERE ID = ?;
+SELECT id, username FROM users WHERE ID = ?;
 
 -- name: AddUser :exec
 INSERT INTO users (Username) VALUES (?);
 
 -- name: GetUserSessions :many
-SELECT * FROM user_sessions_view WHERE user_ID = ?;
+SELECT user_id, username, session_token, created_at, valid_until FROM user_sessions_view WHERE user_ID = ?;
 
 -- name: AddUserSession :exec
 INSERT INTO user_sessions (user_ID, session_token, created_at, valid_until, name)
 VALUES (?, ?, ?, ?, ?);
 
 -- name: GetObjectsInStorage :many
-SELECT * FROM object_storage WHERE storage_location = ?;
+SELECT object_id, object_name, storage_location FROM object_storage WHERE storage_location = ?;
 
 -- name: GetUserEvents :many
-SELECT * FROM event_details WHERE organizer = ?;
+SELECT event_id, event_name, description, location, start_date, end_date, organizer FROM event_details WHERE organizer = ?;
 
 -- name: GetEventObjects :many
-SELECT objects.* FROM objects
-                          JOIN events_objects ON objects.ID = events_objects.object_ID
+SELECT objects.id, objects.storagespace_id, objects.name, objects.description, objects.serialnumber, objects.created 
+FROM objects
+JOIN events_objects ON objects.ID = events_objects.object_ID
 WHERE events_objects.event_ID = ?;
 
 -- name: AddObject :exec
@@ -34,21 +35,21 @@ INSERT INTO events (user_ID, Name, Description, Location, Start_Date, End_Date)
 VALUES (?, ?, ?, ?, ?, ?);
 
 -- name: GetEventCheckIns :many
-SELECT * FROM check_in_log WHERE event_name = ?;
+SELECT check_in_id, username, event_name, object_name, datetime, checkin_state FROM check_in_log WHERE event_name = ?;
 
 -- name: AddCheckIn :exec
 INSERT INTO check_in (user_ID, checkin_event_ID, event_ID, object_ID, checkin_state_ID, datetime)
 VALUES (?, ?, ?, ?, ?, ?);
 
 -- name: GetObjectAnnotations :many
-SELECT * FROM annotations WHERE object_ID = ?;
+SELECT id, user_id, object_id, event_id, check_in_id, events_object_id, text, datetime FROM annotations WHERE object_ID = ?;
 
 -- name: AddAnnotation :exec
 INSERT INTO annotations (user_ID, object_ID, event_ID, check_in_ID, events_object_ID, text, datetime)
 VALUES (?, ?, ?, ?, ?, ?, ?);
 
 -- name: GetEventPictures :many
-SELECT * FROM pictures WHERE event_ID = ?;
+SELECT id, user_id, storagespace_id, object_id, event_id, check_in_id, path, description, datetime FROM pictures WHERE event_ID = ?;
 
 -- name: AddPicture :exec
 INSERT INTO pictures (user_ID, storagespace_ID, object_ID, event_ID, check_in_ID, Path, Description, datetime)
diff --git a/main.go b/main.go
index ec778f7..5619620 100644
--- a/main.go
+++ b/main.go
@@ -23,7 +23,7 @@ import (
 	"gopkg.in/yaml.v2"
 	
 	"github.com/your-username/your-repo/api"
-	db "github.com/your-username/your-repo/database/sqlite/generated"
+	db "github.com/your-username/your-repo/database/sqlite/generated/sqlite"
 )
 
 //go:embed static/*