sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases1 Wiki Activity

Tweak migrations

Browse source
This commit is contained in:
Neil Alexander 2022-11-08 13:11:37 +00:00
parent ea3517d94e
commit 32127f4f1c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 18 additions and 30 deletions
userapi/storage
postgres
storage.go
sqlite3
storage.go

10
userapi/storage/postgres/storage.go
View file

@ -15,6 +15,8 @@
package postgres package postgres
import ( import (
"context"
"database/sql"
"fmt" "fmt"
"time" "time"
@ -43,7 +45,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
Up: deltas.UpRenameTables, Up: deltas.UpRenameTables,
Down: deltas.DownRenameTables, Down: deltas.DownRenameTables,
}) })
/*
m.AddMigrations(sqlutil.Migration{ m.AddMigrations(sqlutil.Migration{
Version: "userapi: server names", Version: "userapi: server names",
Up: func(ctx context.Context, txn *sql.Tx) error { Up: func(ctx context.Context, txn *sql.Tx) error {
@ -51,7 +52,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
}, },
Down: deltas.DownServerNames, Down: deltas.DownServerNames,
}) })
*/
if err = m.Up(base.Context()); err != nil { if err = m.Up(base.Context()); err != nil {
return nil, err return nil, err
} }
@ -105,12 +105,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
return nil, fmt.Errorf("NewPostgresStatsTable: %w", err) return nil, fmt.Errorf("NewPostgresStatsTable: %w", err)
} }
m = sqlutil.NewMigrator(db)
if err = m.Up(base.Context()); err != nil {
return nil, err
}
return &shared.Database{ return &shared.Database{
AccountDatas: accountDataTable, AccountDatas: accountDataTable,
Accounts: accountsTable, Accounts: accountsTable,

10
userapi/storage/sqlite3/storage.go
View file

@ -15,6 +15,8 @@
package sqlite3 package sqlite3
import ( import (
"context"
"database/sql"
"fmt" "fmt"
"time" "time"
@ -41,7 +43,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
Up: deltas.UpRenameTables, Up: deltas.UpRenameTables,
Down: deltas.DownRenameTables, Down: deltas.DownRenameTables,
}) })
/*
m.AddMigrations(sqlutil.Migration{ m.AddMigrations(sqlutil.Migration{
Version: "userapi: server names", Version: "userapi: server names",
Up: func(ctx context.Context, txn *sql.Tx) error { Up: func(ctx context.Context, txn *sql.Tx) error {
@ -49,7 +50,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
}, },
Down: deltas.DownServerNames, Down: deltas.DownServerNames,
}) })
*/
if err = m.Up(base.Context()); err != nil { if err = m.Up(base.Context()); err != nil {
return nil, err return nil, err
} }
@ -103,12 +103,6 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions,
return nil, fmt.Errorf("NewSQLiteStatsTable: %w", err) return nil, fmt.Errorf("NewSQLiteStatsTable: %w", err)
} }
m = sqlutil.NewMigrator(db)
if err = m.Up(base.Context()); err != nil {
return nil, err
}
return &shared.Database{ return &shared.Database{
AccountDatas: accountDataTable, AccountDatas: accountDataTable,
Accounts: accountsTable, Accounts: accountsTable,