Add table migrations

userapi/storage/accounts/postgres/accounts_table.go

@@ -68,10 +68,10 @@ const selectNewNumericLocalpartSQL = "" +
 	"SELECT nextval('numeric_username_seq')"
 
 const selectPrivacyPolicySQL = "" +
-	"SELECT policy_version FROM accounts_accounts WHERE localpart = $1"
+	"SELECT policy_version FROM account_accounts WHERE localpart = $1"
 
 const batchSelectPrivacyPolicySQL = "" +
-	"SELECT localpart FROM accounts_accounts WHERE policy_version IS NULL or policy_version <> $1"
+	"SELECT localpart FROM account_accounts WHERE policy_version IS NULL or policy_version <> $1"
 
 type accountsStatements struct {
 	insertAccountStmt             *sql.Stmt

userapi/storage/accounts/postgres/deltas/20200929203058_is_active.go

@@ -10,6 +10,7 @@ import (
 
 func LoadFromGoose() {
 	goose.AddMigration(UpIsActive, DownIsActive)
+	goose.AddMigration(UpAddPolicyVersion, DownAddPolicyVersion)
 }
 
 func LoadIsActive(m *sqlutil.Migrations) {

userapi/storage/accounts/postgres/deltas/2022021414375800_add_policy_version.go

@@ -0,0 +1,28 @@
+package deltas
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/matrix-org/dendrite/internal/sqlutil"
+)
+
+func LoadAddPolicyVersion(m *sqlutil.Migrations) {
+	m.AddMigration(UpAddPolicyVersion, DownAddPolicyVersion)
+}
+
+func UpAddPolicyVersion(tx *sql.Tx) error {
+	_, err := tx.Exec("ALTER TABLE account_accounts ADD COLUMN IF NOT EXISTS policy_version TEXT;")
+	if err != nil {
+		return fmt.Errorf("failed to execute upgrade: %w", err)
+	}
+	return nil
+}
+
+func DownAddPolicyVersion(tx *sql.Tx) error {
+	_, err := tx.Exec("ALTER TABLE account_accounts DROP COLUMN policy_version;")
+	if err != nil {
+		return fmt.Errorf("failed to execute downgrade: %w", err)
+	}
+	return nil
+}

userapi/storage/accounts/postgres/storage.go

@@ -73,6 +73,7 @@ func NewDatabase(dbProperties *config.DatabaseOptions, serverName gomatrixserver
 	}
 	m := sqlutil.NewMigrations()
 	deltas.LoadIsActive(m)
+	deltas.LoadAddPolicyVersion(m)
 	if err = m.RunDeltas(db, dbProperties); err != nil {
 		return nil, err
 	}

userapi/storage/accounts/sqlite3/accounts_table.go

@@ -66,10 +66,10 @@ const selectNewNumericLocalpartSQL = "" +
 	"SELECT COUNT(localpart) FROM account_accounts"
 
 const selectPrivacyPolicySQL = "" +
-	"SELECT policy_version FROM accounts_accounts WHERE localpart = $1"
+	"SELECT policy_version FROM account_accounts WHERE localpart = $1"
 
 const batchSelectPrivacyPolicySQL = "" +
-	"SELECT localpart FROM accounts_accounts WHERE policy_version IS NULL or policy_version <> $1"
+	"SELECT localpart FROM account_accounts WHERE policy_version IS NULL or policy_version <> $1"
 
 type accountsStatements struct {
 	db                            *sql.DB

userapi/storage/accounts/sqlite3/deltas/20200929203058_is_active.go

@@ -10,6 +10,7 @@ import (
 
 func LoadFromGoose() {
 	goose.AddMigration(UpIsActive, DownIsActive)
+	goose.AddMigration(UpAddPolicyVersion, DownAddPolicyVersion)
 }
 
 func LoadIsActive(m *sqlutil.Migrations) {

userapi/storage/accounts/sqlite3/deltas/2022021414375800_add_policy_version.go

@@ -0,0 +1,28 @@
+package deltas
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/matrix-org/dendrite/internal/sqlutil"
+)
+
+func LoadAddPolicyVersion(m *sqlutil.Migrations) {
+	m.AddMigration(UpAddPolicyVersion, DownAddPolicyVersion)
+}
+
+func UpAddPolicyVersion(tx *sql.Tx) error {
+	_, err := tx.Exec("ALTER TABLE account_accounts ADD COLUMN policy_version TEXT;")
+	if err != nil {
+		return fmt.Errorf("failed to execute upgrade: %w", err)
+	}
+	return nil
+}
+
+func DownAddPolicyVersion(tx *sql.Tx) error {
+	_, err := tx.Exec("ALTER TABLE account_accounts DROP COLUMN policy_version;")
+	if err != nil {
+		return fmt.Errorf("failed to execute downgrade: %w", err)
+	}
+	return nil
+}

userapi/storage/accounts/sqlite3/storage.go

@@ -77,6 +77,7 @@ func NewDatabase(dbProperties *config.DatabaseOptions, serverName gomatrixserver
 	}
 	m := sqlutil.NewMigrations()
 	deltas.LoadIsActive(m)
+	deltas.LoadAddPolicyVersion(m)
 	if err = m.RunDeltas(db, dbProperties); err != nil {
 		return nil, err
 	}