Merge pull request #257 from systemli/Fix-Migrations-for-MySQL

🐛 Fix Migrations for MySQL
systemli · Oct 22, 2023 · 8fa16f4 · 8fa16f4
2 parents 58cbfab + eba6b5b
commit 8fa16f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/internal/legacy/migration.go b/internal/legacy/migration.go
@@ -111,7 +111,7 @@ func (m *Migration) Do() error {
 				},
 			}
 
-			if err := m.newStorage.SaveMessage(&message); err != nil {
+			if err := m.newStorage.DB.Create(&message).Error; err != nil {
 				log.WithError(err).WithField("message_id", message.ID).Error("Unable to save message")
 				continue
 			}
@@ -134,7 +134,7 @@ func (m *Migration) Do() error {
 			IsSuperAdmin:      oldUser.IsSuperAdmin,
 		}
 
-		if err := m.newStorage.SaveUser(&user); err != nil {
+		if err := m.newStorage.DB.Create(&user).Error; err != nil {
 			log.WithError(err).WithField("user_id", user.ID).Error("Unable to save user")
 			continue
 		}
@@ -169,7 +169,7 @@ func (m *Migration) Do() error {
 			ContentType: oldUpload.ContentType,
 		}
 
-		if err := m.newStorage.SaveUpload(&upload); err != nil {
+		if err := m.newStorage.DB.Create(&upload).Error; err != nil {
 			log.WithError(err).WithField("upload_id", upload.ID).Error("Unable to save upload")
 			continue
 		}

diff --git a/internal/storage/migrations.go b/internal/storage/migrations.go
@@ -5,14 +5,14 @@ import "gorm.io/gorm"
 // MigrateDB migrates the database
 func MigrateDB(db *gorm.DB) error {
 	return db.AutoMigrate(
-		&Attachment{},
-		&Message{},
-		&Setting{},
 		&Ticker{},
 		&TickerInformation{},
 		&TickerMastodon{},
 		&TickerTelegram{},
-		&Upload{},
 		&User{},
+		&Setting{},
+		&Upload{},
+		&Message{},
+		&Attachment{},
 	)
 }