bridgev2/legacymigrate: fix error message for other db upgrade

tulir · tulir · commit e0961922e5c0 · 2024-10-01T17:52:28.000+03:00
diff --git a/bridgev2/matrix/mxmain/legacymigrate.go b/bridgev2/matrix/mxmain/legacymigrate.go
@@ -62,7 +62,7 @@ func (br *BridgeMain) LegacyMigrateWithAnotherUpgrader(renameTablesQuery, copyDa
 			if err != nil {
 				return err
 			} else if otherUpgradesTo < otherNewVersion || otherCompat > otherNewVersion {
-				return fmt.Errorf("unexpected new database version for %s (%d/c:%d, expected %d)", otherTableName, otherUpgradesTo, otherCompat, newDBVersion)
+				return fmt.Errorf("unexpected new database version for %s (%d/c:%d, expected %d)", otherTableName, otherUpgradesTo, otherCompat, otherNewVersion)
 			}
 			_, err = br.DB.Exec(ctx, fmt.Sprintf("INSERT INTO %s (version, compat) VALUES ($1, $2)", otherTableName), otherUpgradesTo, otherCompat)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (br *BridgeMain) LegacyMigrateWithAnotherUpgrader(renameTablesQuery, copyDa`
`62`	`62`	`if err != nil {`
`63`	`63`	`return err`
`64`	`64`	`} else if otherUpgradesTo < otherNewVersion \|\| otherCompat > otherNewVersion {`
`65`		`- return fmt.Errorf("unexpected new database version for %s (%d/c:%d, expected %d)", otherTableName, otherUpgradesTo, otherCompat, newDBVersion)`
	`65`	`+ return fmt.Errorf("unexpected new database version for %s (%d/c:%d, expected %d)", otherTableName, otherUpgradesTo, otherCompat, otherNewVersion)`
`66`	`66`	`}`
`67`	`67`	`_, err = br.DB.Exec(ctx, fmt.Sprintf("INSERT INTO %s (version, compat) VALUES ($1, $2)", otherTableName), otherUpgradesTo, otherCompat)`
`68`	`68`	`if err != nil {`