From 0c88c2e97f5d695fb08e7f9a30b546a9fa08067d Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 15 Oct 2020 17:43:33 +0100 Subject: [PATCH] Linting --- userapi/storage/devices/postgres/storage.go | 4 +++- userapi/storage/devices/sqlite3/storage.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/userapi/storage/devices/postgres/storage.go b/userapi/storage/devices/postgres/storage.go index 602051dcc..e318b260b 100644 --- a/userapi/storage/devices/postgres/storage.go +++ b/userapi/storage/devices/postgres/storage.go @@ -46,7 +46,9 @@ func NewDatabase(dbProperties *config.DatabaseOptions, serverName gomatrixserver // Create tables before executing migrations so we don't fail if the table is missing, // and THEN prepare statements so we don't fail due to referencing new columns - d.execSchema(db) + if err = d.execSchema(db); err != nil { + return nil, err + } m := sqlutil.NewMigrations() deltas.LoadLastSeenTSIP(m) if err = m.RunDeltas(db, dbProperties); err != nil { diff --git a/userapi/storage/devices/sqlite3/storage.go b/userapi/storage/devices/sqlite3/storage.go index 8c02372db..25888eae4 100644 --- a/userapi/storage/devices/sqlite3/storage.go +++ b/userapi/storage/devices/sqlite3/storage.go @@ -50,7 +50,9 @@ func NewDatabase(dbProperties *config.DatabaseOptions, serverName gomatrixserver // Create tables before executing migrations so we don't fail if the table is missing, // and THEN prepare statements so we don't fail due to referencing new columns - d.execSchema(db) + if err = d.execSchema(db); err != nil { + return nil, err + } m := sqlutil.NewMigrations() deltas.LoadLastSeenTSIP(m) if err = m.RunDeltas(db, dbProperties); err != nil {