实现全新部署数据清理保护
部署脚本、外部数据库初始化保护及统一证书域名配置已完成;不保留旧运行数据。
This commit is contained in:
1 parent
a6e55db4f5
commit
e3c6717cbb
9 files changed
+161
-119
No files matched your search
@@ -570,12 +570,32 @@ func validMySQLIdentifier(value string) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
type sqlSetupDatabase struct {
|
||||
*sql.DB
|
||||
}
|
||||
|
||||
func (database *sqlSetupDatabase) TableCountContext(ctx stdcontext.Context, query string) (int, error) {
|
||||
var count int
|
||||
if err := database.QueryRowContext(ctx, query).Scan(&count); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return count, nil
|
||||
}
|
||||
|
||||
var openMySQLSetupDatabase = func(dsn string) (setupDatabase, error) {
|
||||
return sql.Open("mysql", dsn)
|
||||
database, err := sql.Open("mysql", dsn)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &sqlSetupDatabase{DB: database}, nil
|
||||
}
|
||||
|
||||
var openPostgresSetupDatabase = func(dsn string) (setupDatabase, error) {
|
||||
return sql.Open("postgres", dsn)
|
||||
database, err := sql.Open("postgres", dsn)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &sqlSetupDatabase{DB: database}, nil
|
||||
}
|
||||
|
||||
func ensurePostgresDatabase(dsn string) error {
|
||||
@@ -596,7 +616,7 @@ func ensurePostgresDatabase(dsn string) error {
|
||||
}
|
||||
defer func() { _ = target.Close() }()
|
||||
if err = target.PingContext(requestContext); err == nil {
|
||||
return nil
|
||||
return requireEmptyExternalDatabase(target, requestContext, "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema NOT IN ('pg_catalog', 'information_schema')")
|
||||
} else {
|
||||
var postgresErr *pq.Error
|
||||
if !stderrors.As(err, &postgresErr) || string(postgresErr.Code) != "3D000" {
|
||||
@@ -631,9 +651,21 @@ func ensurePostgresDatabase(dsn string) error {
|
||||
type setupDatabase interface {
|
||||
PingContext(stdcontext.Context) error
|
||||
ExecContext(stdcontext.Context, string, ...any) (sql.Result, error)
|
||||
TableCountContext(stdcontext.Context, string) (int, error)
|
||||
Close() error
|
||||
}
|
||||
|
||||
func requireEmptyExternalDatabase(database setupDatabase, ctx stdcontext.Context, query string) error {
|
||||
count, err := database.TableCountContext(ctx, query)
|
||||
if err != nil {
|
||||
return databaseError("检查外部数据库是否为空失败", err)
|
||||
}
|
||||
if count > 0 {
|
||||
return databaseError("全新部署要求外部数据库为空,请使用新数据库或先清理 Smail 专属数据库", nil)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func ensureMySQLDatabase(dsn string) error {
|
||||
parsed, err := mysql.ParseDSN(dsn)
|
||||
if err != nil {
|
||||
@@ -652,7 +684,7 @@ func ensureMySQLDatabase(dsn string) error {
|
||||
}
|
||||
defer func() { _ = target.Close() }()
|
||||
if err = target.PingContext(requestContext); err == nil {
|
||||
return nil
|
||||
return requireEmptyExternalDatabase(target, requestContext, "SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = DATABASE()")
|
||||
} else {
|
||||
var mysqlErr *mysql.MySQLError
|
||||
if !errors.As(err, &mysqlErr) || mysqlErr.Number != 1049 {
|
||||
|
||||
Reference in new issue
Block a user