Эх сурвалжийг харах

Maybe fix database migration

Fixes #335
Fixes #304
Tulir Asokan 3 жил өмнө
parent
commit
d52b012b37
2 өөрчлөгдсөн 4 нэмэгдсэн , 4 устгасан
  1. 3 3
      database/migrate.go
  2. 1 1
      main.go

+ 3 - 3
database/migrate.go

@@ -108,7 +108,7 @@ func Migrate(old *Database, new *Database) {
 	if err != nil {
 		panic(err)
 	}
-	err = migrateTable(old, new, "message", "chat_jid", "chat_receiver", "jid", "mxid", "sender", "content", "timestamp")
+	err = migrateTable(old, new, "message", "chat_jid", "chat_receiver", "jid", "mxid", "sender", "timestamp", "sent")
 	if err != nil {
 		panic(err)
 	}
@@ -116,7 +116,7 @@ func Migrate(old *Database, new *Database) {
 	if err != nil {
 		panic(err)
 	}
-	err = migrateTable(old, new, "mx_user_profile", "room_id", "user_id", "membership")
+	err = migrateTable(old, new, "mx_user_profile", "room_id", "user_id", "membership", "displayname", "avatar_url")
 	if err != nil {
 		panic(err)
 	}
@@ -144,7 +144,7 @@ func Migrate(old *Database, new *Database) {
 	if err != nil {
 		panic(err)
 	}
-	err = migrateTable(old, new, "crypto_megolm_inbound_session", "account_id", "session_id", "sender_key", "signing_key", "room_id", "session", "forwarding_chains")
+	err = migrateTable(old, new, "crypto_megolm_inbound_session", "account_id", "session_id", "sender_key", "signing_key", "room_id", "session", "forwarding_chains", "withheld_code", "withheld_reason")
 	if err != nil {
 		panic(err)
 	}

+ 1 - 1
main.go

@@ -120,7 +120,7 @@ func (bridge *Bridge) MigrateDatabase() {
 		os.Exit(31)
 	}
 
-	newDB, err := database.New(bridge.Config.AppService.Database.Type, bridge.Config.AppService.Database.URI, bridge.Log)
+	newDB, err := database.New(bridge.Config.AppService.Database.Type, bridge.Config.AppService.Database.URI, log.DefaultLogger)
 	if err != nil {
 		fmt.Println("Failed to open new database:", err)
 		os.Exit(32)