From c4b8cfa75647da44214f0e6c54646ec7ffd57768 Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Mon, 2 Mar 2026 20:04:03 -0500 Subject: [PATCH] Manual correction --- user/manager_sqlite_schema.go | 3 +-- webpush/store_sqlite.go | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/user/manager_sqlite_schema.go b/user/manager_sqlite_schema.go index 4fbd0c02..e6c84e01 100644 --- a/user/manager_sqlite_schema.go +++ b/user/manager_sqlite_schema.go @@ -328,8 +328,7 @@ var ( func setupSQLite(db *sql.DB) error { var schemaVersion int - err := db.QueryRow(sqliteSelectSchemaVersionQuery).Scan(&schemaVersion) - if err != nil { + if err := db.QueryRow(sqliteSelectSchemaVersionQuery).Scan(&schemaVersion); err != nil { return setupNewSQLite(db) } if schemaVersion == sqliteCurrentSchemaVersion { diff --git a/webpush/store_sqlite.go b/webpush/store_sqlite.go index 90ca14a8..4ef78140 100644 --- a/webpush/store_sqlite.go +++ b/webpush/store_sqlite.go @@ -111,11 +111,9 @@ func NewSQLiteStore(filename, startupQueries string) (*Store, error) { func setupSQLite(db *sql.DB) error { var schemaVersion int - err := db.QueryRow(sqliteSelectSchemaVersionQuery).Scan(&schemaVersion) - if err != nil { + if err := db.QueryRow(sqliteSelectSchemaVersionQuery).Scan(&schemaVersion); err != nil { return setupNewSQLite(db) - } - if schemaVersion > sqliteCurrentSchemaVersion { + } else if schemaVersion > sqliteCurrentSchemaVersion { return fmt.Errorf("unexpected schema version: version %d is higher than current version %d", schemaVersion, sqliteCurrentSchemaVersion) } return nil