mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more tweaks

Browse source
This commit is contained in:
Till Faelligen 2022-09-15 08:30:08 +02:00
parent 36128f6294
commit f9291f59a9
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
internal/sqlutil/migrate.go
View file

@ -49,7 +49,7 @@ type Migration struct {
Down func(ctx context.Context, txn *sql.Tx) error Down func(ctx context.Context, txn *sql.Tx) error
} }
// Migrator // Migrator contains fields required to run migrations.
type Migrator struct { type Migrator struct {
db *sql.DB db *sql.DB
migrations []Migration migrations []Migration
@ -82,10 +82,6 @@ func (m *Migrator) AddMigrations(migrations ...Migration) {
// Up executes all migrations in order they were added. // Up executes all migrations in order they were added.
func (m *Migrator) Up(ctx context.Context) error { func (m *Migrator) Up(ctx context.Context) error {
var (
err error
dendriteVersion = internal.VersionString()
)
// ensure there is a table for known migrations // ensure there is a table for known migrations
executedMigrations, err := m.ExecutedMigrations(ctx) executedMigrations, err := m.ExecutedMigrations(ctx)
if err != nil { if err != nil {
@ -94,23 +90,17 @@ func (m *Migrator) Up(ctx context.Context) error {
return WithTransaction(m.db, func(txn *sql.Tx) error { return WithTransaction(m.db, func(txn *sql.Tx) error {
for i := range m.migrations { for i := range m.migrations {
now := time.Now().UTC().Format(time.RFC3339)
migration := m.migrations[i] migration := m.migrations[i]
// Skip migration if it was already executed // Skip migration if it was already executed
if _, ok := executedMigrations[migration.Version]; ok { if _, ok := executedMigrations[migration.Version]; ok {
continue continue
} }
logrus.Debugf("Executing database migration '%s'", migration.Version) logrus.Debugf("Executing database migration '%s'", migration.Version)
err = migration.Up(ctx, txn)
if err != nil { if err = migration.Up(ctx, txn); err != nil {
return fmt.Errorf("unable to execute migration '%s': %w", migration.Version, err) return fmt.Errorf("unable to execute migration '%s': %w", migration.Version, err)
} }
_, err = txn.ExecContext(ctx, insertVersionSQL, if err = m.insertMigration(ctx, txn, migration.Version); err != nil {
migration.Version,
now,
dendriteVersion,
)
if err != nil {
return fmt.Errorf("unable to insert executed migrations: %w", err) return fmt.Errorf("unable to insert executed migrations: %w", err)
} }
} }
@ -118,6 +108,19 @@ func (m *Migrator) Up(ctx context.Context) error {
}) })
} }
type execProvider interface {
ExecContext(ctx context.Context, query string, args ...any) (sql.Result, error)
}
func (m *Migrator) insertMigration(ctx context.Context, provider execProvider, migrationName string) error {
_, err := provider.ExecContext(ctx, insertVersionSQL,
migrationName,
time.Now().Format(time.RFC3339),
internal.VersionString(),
)
return err
}
// ExecutedMigrations returns a map with already executed migrations in addition to creating the // ExecutedMigrations returns a map with already executed migrations in addition to creating the
// migrations table, if it doesn't exist. // migrations table, if it doesn't exist.
func (m *Migrator) ExecutedMigrations(ctx context.Context) (map[string]struct{}, error) { func (m *Migrator) ExecutedMigrations(ctx context.Context) (map[string]struct{}, error) {
@ -154,10 +157,5 @@ func InsertMigration(ctx context.Context, db *sql.DB, migrationName string) erro
if _, ok := existingMigrations[migrationName]; ok { if _, ok := existingMigrations[migrationName]; ok {
return nil return nil
} }
_, err = m.db.ExecContext(ctx, insertVersionSQL, return m.insertMigration(ctx, nil, migrationName)
migrationName,
time.Now().Format(time.RFC3339),
internal.VersionString(),
)
return err
} }