fix(migrations): ensure migrations are ran in version order

migrate/migrator.go

@@ -5,6 +5,7 @@ import (
 	"embed"
 	"errors"
 	"fmt"
+
 	"github.com/oriser/regroup"
 	"modernc.org/sqlite"
 )
@@ -63,15 +64,15 @@ func (m *Migrator) Migrate(fs *embed.FS, component string) error {
 	}
 
 	// migrate
-	for _, migration := range migrations {
+	for _, mg := range migrations {
 		// already have this version?
-		if _, exists := versions[migration.Version]; exists {
+		if _, exists := versions[mg.Version]; exists {
 			continue
 		}
 
 		// migrate
-		if err := m.exec(component, migration); err != nil {
-			return fmt.Errorf("migrate: %v: %w", migration.Filename, err)
+		if err := m.exec(component, mg); err != nil {
+			return fmt.Errorf("migrate: %v: %w", mg.Filename, err)
 		}
 	}
 

migrate/util.go

@@ -5,6 +5,7 @@ import (
 	"embed"
 	"fmt"
 	"path/filepath"
+	"sort"
 )
 
 type migration struct {
@@ -77,15 +78,15 @@ func (m *Migrator) exec(component string, migration *migration) (err error) {
 	return nil
 }
 
-func (m *Migrator) parse(fs *embed.FS) (map[int]*migration, error) {
+func (m *Migrator) parse(fs *embed.FS) ([]*migration, error) {
 	// parse migrations from filesystem
 	files, err := fs.ReadDir(m.dir)
 	if err != nil {
 		return nil, fmt.Errorf("read migrations: %w", err)
 	}
 
 	// parse migrations
-	migrations := make(map[int]*migration)
+	migrations := make([]*migration, 0)
 	for _, f := range files {
 		// skip dirs
 		if f.IsDir() {
@@ -106,9 +107,14 @@ func (m *Migrator) parse(fs *embed.FS) (map[int]*migration, error) {
 		md.Filename = f.Name()
 
 		// set migration
-		migrations[md.Version] = md
+		migrations = append(migrations, md)
 	}
 
+	// sort migrations
+	sort.Slice(migrations, func(i, j int) bool {
+		return migrations[i].Version < migrations[j].Version
+	})
+
 	return migrations, nil
 }
 

radarr/migrations/1_init.sql

@@ -2,6 +2,5 @@ CREATE TABLE IF NOT EXISTS movies (
     "movie" INTEGER NOT NULL,
     "release_date" DATETIME NOT NULL,
     "search_date" DATETIME NULL,
-    "type" VARCHAR(10),
     PRIMARY KEY(movie)
 )