From 1fc1df577dcffb3d0cd88ad6058e9915b3a614cc Mon Sep 17 00:00:00 2001 From: Marco Realacci Date: Thu, 22 Dec 2022 17:17:28 +0100 Subject: [PATCH] Revert back db tables check --- .vscode/launch.json | 6 +++--- service/database/database.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8040bd0..24ca420 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,9 +12,9 @@ "mode": "auto", "buildFlags": "-tags webui", "program": "./cmd/webapi", - "args": [ - "--db-filename", "/home/marco/wasa/wasadata/wasaphoto.db", "--data-path", "/home/marco/wasa/wasadata/data" - ] + //"args": [ + // "--db-filename", "/home/marco/wasa/wasadata/wasaphoto.db", "--data-path", "/home/marco/wasa/wasadata/data" + //] } ] } \ No newline at end of file diff --git a/service/database/database.go b/service/database/database.go index dedae81..2796d56 100644 --- a/service/database/database.go +++ b/service/database/database.go @@ -98,8 +98,8 @@ func New(db *sql.DB) (AppDatabase, error) { // Check if tables exist. If not, the database is empty, and we need to create the structure var tableName string //todo: check for all the tables, not just users - err := db.QueryRow(`SELECT uid from users LIMIT 1;`).Scan(&tableName) - if err != nil { + err := db.QueryRow(`SELECT name FROM sqlite_master WHERE type='table' AND name='users';`).Scan(&tableName) + if errors.Is(err, sql.ErrNoRows) { //fmt.Println("database is empty, creating structure") sqlStmt := `CREATE TABLE "users" ( "uid" TEXT NOT NULL,