From d7171e14834412bccc69b8104179a86d381b4a1f Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Sun, 11 Sep 2022 09:32:26 +0200
Subject: [PATCH] Fail to start if we get a non-uniqueconstraint error

---
 keyserver/storage/postgres/key_changes_table.go | 6 ++----
 keyserver/storage/sqlite3/key_changes_table.go  | 6 ++----
 roomserver/storage/postgres/storage.go          | 5 +----
 roomserver/storage/sqlite3/storage.go           | 4 +---
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/keyserver/storage/postgres/key_changes_table.go b/keyserver/storage/postgres/key_changes_table.go
index e91b048d5..c0e3429c7 100644
--- a/keyserver/storage/postgres/key_changes_table.go
+++ b/keyserver/storage/postgres/key_changes_table.go
@@ -18,8 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-
-	"github.com/sirupsen/logrus"
+	"fmt"
 
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
@@ -81,8 +80,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
 			if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
-				// not a fatal error, log and continue
-				logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
+				return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
 			}
 			return nil
 		}
diff --git a/keyserver/storage/sqlite3/key_changes_table.go b/keyserver/storage/sqlite3/key_changes_table.go
index b68df5552..0c844d67a 100644
--- a/keyserver/storage/sqlite3/key_changes_table.go
+++ b/keyserver/storage/sqlite3/key_changes_table.go
@@ -18,8 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-
-	"github.com/sirupsen/logrus"
+	"fmt"
 
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
@@ -80,8 +79,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
 			if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
-				// not a fatal error, log and continue
-				logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
+				return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
 			}
 			return nil
 		}
diff --git a/roomserver/storage/postgres/storage.go b/roomserver/storage/postgres/storage.go
index 26178df83..23a5f79eb 100644
--- a/roomserver/storage/postgres/storage.go
+++ b/roomserver/storage/postgres/storage.go
@@ -21,8 +21,6 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/sirupsen/logrus"
-
 	// Import the postgres database driver.
 	_ "github.com/lib/pq"
 
@@ -79,8 +77,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
 			if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
-				// not a fatal error, log and continue
-				logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
+				return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
 			}
 			return nil
 		}
diff --git a/roomserver/storage/sqlite3/storage.go b/roomserver/storage/sqlite3/storage.go
index c7bc00393..01c3f879c 100644
--- a/roomserver/storage/sqlite3/storage.go
+++ b/roomserver/storage/sqlite3/storage.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 
 	"github.com/matrix-org/gomatrixserverlib"
-	"github.com/sirupsen/logrus"
 
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
@@ -87,8 +86,7 @@ func executeMigration(ctx context.Context, db *sql.DB) error {
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) { // migration was already executed, as the column was removed
 			if err = sqlutil.InsertMigration(ctx, db, migrationName); err != nil {
-				// not a fatal error, log and continue
-				logrus.WithError(err).Warnf("unable to manually insert migration '%s'", migrationName)
+				return fmt.Errorf("unable to manually insert migration '%s': %w", migrationName, err)
 			}
 			return nil
 		}