From 2e74be1bf2210c7d021f45f7c8ef63328f0d13ae Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Mon, 7 Nov 2022 12:07:30 +0000
Subject: [PATCH] Clean up some logging

---
 userapi/storage/postgres/storage.go            | 18 +++++++++---------
 userapi/storage/sqlite3/accounts_table.go      |  4 ----
 .../deltas/2022110411000000_server_names.go    |  3 ---
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/userapi/storage/postgres/storage.go b/userapi/storage/postgres/storage.go
index 64038c84b..8f8bb95b7 100644
--- a/userapi/storage/postgres/storage.go
+++ b/userapi/storage/postgres/storage.go
@@ -15,8 +15,6 @@
 package postgres
 
 import (
-	"context"
-	"database/sql"
 	"fmt"
 	"time"
 
@@ -45,13 +43,15 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
 		Up:      deltas.UpRenameTables,
 		Down:    deltas.DownRenameTables,
 	})
-	m.AddMigrations(sqlutil.Migration{
-		Version: "userapi: server names",
-		Up: func(ctx context.Context, txn *sql.Tx) error {
-			return deltas.UpServerNames(ctx, txn, serverName)
-		},
-		Down: deltas.DownServerNames,
-	})
+	/*
+		m.AddMigrations(sqlutil.Migration{
+			Version: "userapi: server names",
+			Up: func(ctx context.Context, txn *sql.Tx) error {
+				return deltas.UpServerNames(ctx, txn, serverName)
+			},
+			Down: deltas.DownServerNames,
+		})
+	*/
 	if err = m.Up(base.Context()); err != nil {
 		return nil, err
 	}
diff --git a/userapi/storage/sqlite3/accounts_table.go b/userapi/storage/sqlite3/accounts_table.go
index 755492f33..6f855b1e8 100644
--- a/userapi/storage/sqlite3/accounts_table.go
+++ b/userapi/storage/sqlite3/accounts_table.go
@@ -17,7 +17,6 @@ package sqlite3
 import (
 	"context"
 	"database/sql"
-	"fmt"
 	"time"
 
 	"github.com/matrix-org/gomatrixserverlib"
@@ -90,7 +89,6 @@ func NewSQLiteAccountsTable(db *sql.DB, serverName gomatrixserverlib.ServerName)
 	if err != nil {
 		return nil, err
 	}
-	fmt.Println("TABLE CREATED")
 	m := sqlutil.NewMigrator(db)
 	m.AddMigrations([]sqlutil.Migration{
 		{
@@ -108,8 +106,6 @@ func NewSQLiteAccountsTable(db *sql.DB, serverName gomatrixserverlib.ServerName)
 	if err != nil {
 		return nil, err
 	}
-	fmt.Println("MIGRATIONS RUN")
-	defer fmt.Println("STATEMENTS PREPARED")
 	return s, sqlutil.StatementList{
 		{&s.insertAccountStmt, insertAccountSQL},
 		{&s.updatePasswordStmt, updatePasswordSQL},
diff --git a/userapi/storage/sqlite3/deltas/2022110411000000_server_names.go b/userapi/storage/sqlite3/deltas/2022110411000000_server_names.go
index b867530b9..ba0abfb9b 100644
--- a/userapi/storage/sqlite3/deltas/2022110411000000_server_names.go
+++ b/userapi/storage/sqlite3/deltas/2022110411000000_server_names.go
@@ -33,10 +33,7 @@ func UpServerNames(ctx context.Context, tx *sql.Tx, serverName gomatrixserverlib
 		)
 		var c int
 		if err := tx.QueryRowContext(ctx, q).Scan(&c); err != nil || c == 0 {
-			fmt.Println("Error:", err)
 			continue
-		} else {
-			fmt.Println("HAPPY DAYS!", table)
 		}
 		q = fmt.Sprintf(
 			"ALTER TABLE %s ADD COLUMN IF NOT EXISTS server_name TEXT NOT NULL DEFAULT '';",