From 25e4d6448bcadc09cf65b6c6b6420f454b6cb970 Mon Sep 17 00:00:00 2001
From: Matt Baer <matt@write.as>
Date: Wed, 9 Jun 2021 14:25:55 -0400
Subject: [PATCH] Fix ineffectual assignments in migrations

---
 migrations/migrations.go | 3 +++
 migrations/v1.go         | 3 +++
 migrations/v2.go         | 3 +++
 migrations/v3.go         | 3 +++
 migrations/v6.go         | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/migrations/migrations.go b/migrations/migrations.go
index 88897fd..b3ebcc0 100644
--- a/migrations/migrations.go
+++ b/migrations/migrations.go
@@ -87,6 +87,9 @@ func Migrate(db *datastore) error {
 	var err error
 	if db.tableExists("appmigrations") {
 		err = db.QueryRow("SELECT MAX(version) FROM appmigrations").Scan(&version)
+		if err != nil {
+			return err
+		}
 	} else {
 		log.Info("Initializing appmigrations table...")
 		version = 0
diff --git a/migrations/v1.go b/migrations/v1.go
index 81f7d0c..ef3a579 100644
--- a/migrations/v1.go
+++ b/migrations/v1.go
@@ -12,6 +12,9 @@ package migrations
 
 func supportUserInvites(db *datastore) error {
 	t, err := db.Begin()
+	if err != nil {
+		return err
+	}
 	_, err = t.Exec(`CREATE TABLE userinvites (
 		  id ` + db.typeChar(6) + ` NOT NULL ,
 		  owner_id ` + db.typeInt() + ` NOT NULL ,
diff --git a/migrations/v2.go b/migrations/v2.go
index b71ce70..d282ec7 100644
--- a/migrations/v2.go
+++ b/migrations/v2.go
@@ -12,6 +12,9 @@ package migrations
 
 func supportInstancePages(db *datastore) error {
 	t, err := db.Begin()
+	if err != nil {
+		return err
+	}
 
 	_, err = t.Exec(`ALTER TABLE appcontent ADD COLUMN title ` + db.typeVarChar(255) + db.collateMultiByte() + ` NULL`)
 	if err != nil {
diff --git a/migrations/v3.go b/migrations/v3.go
index b5351da..e36b9d0 100644
--- a/migrations/v3.go
+++ b/migrations/v3.go
@@ -12,6 +12,9 @@ package migrations
 
 func supportUserStatus(db *datastore) error {
 	t, err := db.Begin()
+	if err != nil {
+		return err
+	}
 
 	_, err = t.Exec(`ALTER TABLE users ADD COLUMN status ` + db.typeInt() + ` DEFAULT '0' NOT NULL`)
 	if err != nil {
diff --git a/migrations/v6.go b/migrations/v6.go
index 8e0be78..074f446 100644
--- a/migrations/v6.go
+++ b/migrations/v6.go
@@ -12,6 +12,9 @@ package migrations
 
 func supportActivityPubMentions(db *datastore) error {
 	t, err := db.Begin()
+	if err != nil {
+		return err
+	}
 
 	_, err = t.Exec(`ALTER TABLE remoteusers ADD COLUMN handle ` + db.typeVarChar(255) + ` NULL`)
 	if err != nil {