修复历史迁移兼容和数据库页面布局
Security Checks / security (push) Waiting to run

This commit is contained in:
xuans committed 2026-08-31 17:56:16 +08:00
1 parent 8390e27e6c
commit 57f1dab894
9 files changed
+235 -21

No files matched your search

+9 -1
View File
@@ -16,6 +16,7 @@ import (
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db"
"git.pcux.cn/xuans/Smail/db/migration"
"git.pcux.cn/xuans/Smail/models"
"git.pcux.cn/xuans/Smail/services/auth"
"git.pcux.cn/xuans/Smail/utils/array"
@@ -58,6 +59,13 @@ func databaseError(message string, cause error) error {
return &databaseSetupError{Message: message, Cause: cause}
}
func databaseInitializationError(err error) error {
if stderrors.Is(err, migration.ErrChecksumMismatch) || stderrors.Is(err, migration.ErrUnknownAppliedMigration) {
return databaseError("数据库连接成功,但检测到历史迁移记录与当前版本不兼容,请先备份数据库后再执行兼容升级", err)
}
return errors.Wrap(err)
}
func DatabaseSetupErrorMessage(err error) string {
var setupErr *databaseSetupError
if errors.As(err, &setupErr) {
@@ -265,7 +273,7 @@ func SetDatabaseSettingsWithOptions(ctx *context.Context, settings DatabaseSetti
closeDatabaseInstance()
if err = db.Init(""); err != nil {
restoreDatabaseConfig(&previousConfig)
return errors.Wrap(err)
return databaseInitializationError(err)
}
return nil
}
+25
View File
@@ -11,6 +11,7 @@ import (
"time"
"git.pcux.cn/xuans/Smail/config"
"git.pcux.cn/xuans/Smail/db/migration"
"github.com/go-sql-driver/mysql"
"github.com/lib/pq"
)
@@ -369,3 +370,27 @@ func TestPrepareSQLiteDatabaseCreatesParentDirectory(t *testing.T) {
t.Fatalf("SQLite parent directory was not prepared: %v", err)
}
}
func TestDatabaseInitializationErrorReturnsMigrationGuidance(t *testing.T) {
for _, cause := range []error{migration.ErrChecksumMismatch, migration.ErrUnknownAppliedMigration} {
err := databaseInitializationError(cause)
message := DatabaseSetupErrorMessage(err)
if message != "数据库连接成功,但检测到历史迁移记录与当前版本不兼容,请先备份数据库后再执行兼容升级" {
t.Fatalf("message = %q", message)
}
if !stderrors.Is(err, cause) {
t.Fatalf("error does not preserve cause %v", cause)
}
}
}
func TestDatabaseInitializationErrorKeepsGenericErrorsInternal(t *testing.T) {
cause := stderrors.New("internal database detail")
err := databaseInitializationError(cause)
if message := DatabaseSetupErrorMessage(err); message != "" {
t.Fatalf("unexpected user-facing message = %q", message)
}
if !stderrors.Is(err, cause) {
t.Fatal("generic initialization error does not preserve its cause")
}
}