接入域名 DNS 绑定接口并修复历史 MySQL 排序规则兼容
This commit is contained in:
1 parent
45798c5ecf
commit
c80530f60e
12 files changed
+370
-8
No files matched your search
@@ -145,13 +145,24 @@ func checkDomainDNSConstraints(t *testing.T, db *sql.DB, driver string) {
|
||||
|
||||
func TestMySQLDomainDNSAccountInterruptedMigration(t *testing.T) {
|
||||
f := startRealMySQL(t)
|
||||
for _, boundary := range []string{"before_create", "after_create", "after_index", "after_domain_fk", "after_account_fk", "with_binding", "bad_column", "bad_index", "bad_foreign_key", "extra_foreign_key"} {
|
||||
for _, boundary := range []string{"before_create", "after_create", "after_index", "after_domain_fk", "after_account_fk", "with_binding", "changed_schema_default", "bad_column", "bad_column_collation", "bad_index", "bad_foreign_key", "extra_foreign_key"} {
|
||||
t.Run(boundary, func(t *testing.T) {
|
||||
db := f.database(t)
|
||||
mysqlPrepareVersion(t, db.DB, 27)
|
||||
statements := mysqlDeploymentStatements(t, 28)
|
||||
if boundary == "changed_schema_default" {
|
||||
var name string
|
||||
if err := db.DB.QueryRowContext(t.Context(), `SELECT DATABASE()`).Scan(&name); err != nil || !mysqlCollationIdentifier.MatchString(name) {
|
||||
t.Fatal("测试数据库标识无效", err)
|
||||
}
|
||||
mysqlDeploymentExec(t, db.DB, "ALTER DATABASE `"+name+"` CHARACTER SET utf8mb4 COLLATE utf8mb4_bin")
|
||||
}
|
||||
create, _, err := mysqlDomainDNSCreateStatement(t.Context(), db.DB, statements[0])
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if boundary != "before_create" {
|
||||
mysqlDeploymentExec(t, db.DB, statements[0])
|
||||
mysqlDeploymentExec(t, db.DB, create)
|
||||
}
|
||||
if boundary == "after_index" || boundary == "after_domain_fk" || boundary == "after_account_fk" || boundary == "with_binding" {
|
||||
mysqlDeploymentExec(t, db.DB, statements[1])
|
||||
@@ -164,6 +175,8 @@ func TestMySQLDomainDNSAccountInterruptedMigration(t *testing.T) {
|
||||
}
|
||||
conflict := true
|
||||
switch boundary {
|
||||
case "bad_column_collation":
|
||||
mysqlDeploymentExec(t, db.DB, `ALTER TABLE domain_dns_accounts MODIFY COLUMN domain_id VARCHAR(36) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL`)
|
||||
case "bad_column":
|
||||
mysqlDeploymentExec(t, db.DB, `ALTER TABLE domain_dns_accounts MODIFY COLUMN id VARCHAR(36) NULL`)
|
||||
case "bad_index":
|
||||
|
||||
@@ -50,10 +50,11 @@ type mysqlDeploymentColumn struct {
|
||||
}
|
||||
|
||||
type mysqlDeploymentShape struct {
|
||||
Table string
|
||||
Collation string
|
||||
Columns []mysqlDeploymentColumn
|
||||
Indexes []string
|
||||
Table string
|
||||
Collation string
|
||||
Columns []mysqlDeploymentColumn
|
||||
Indexes []string
|
||||
ColumnCollations map[string]string
|
||||
}
|
||||
|
||||
var (
|
||||
@@ -151,7 +152,11 @@ func validateMySQLDeploymentShape(ctx context.Context, db *sql.DB, expected mysq
|
||||
}
|
||||
column.Default = strings.TrimSuffix(strings.ToLower(defaultValue.String), "()")
|
||||
column.HasDefault = defaultValue.Valid
|
||||
if columnCollation.Valid && columnCollation.String != tableCollation {
|
||||
expectedColumnCollation := tableCollation
|
||||
if override := expected.ColumnCollations[column.Name]; override != "" {
|
||||
expectedColumnCollation = override
|
||||
}
|
||||
if columnCollation.Valid && columnCollation.String != expectedColumnCollation {
|
||||
rows.Close()
|
||||
return fmt.Errorf("部署迁移表字段排序规则不匹配:%s.%s", expected.Table, column.Name)
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -16,7 +17,12 @@ func applyMySQLDomainDNSMigration(ctx context.Context, db *sql.DB, version int,
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if _, err := db.ExecContext(ctx, strings.Replace(statements[0], "CREATE TABLE ", "CREATE TABLE IF NOT EXISTS ", 1)); err != nil {
|
||||
create, collation, err := mysqlDomainDNSCreateStatement(ctx, db, statements[0])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
shape.ColumnCollations = map[string]string{"domain_id": collation}
|
||||
if _, err := db.ExecContext(ctx, strings.Replace(create, "CREATE TABLE ", "CREATE TABLE IF NOT EXISTS ", 1)); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := validateMySQLDeploymentShape(ctx, db, shape); err != nil {
|
||||
@@ -65,6 +71,27 @@ func applyMySQLDomainDNSMigration(ctx context.Context, db *sql.DB, version int,
|
||||
return err
|
||||
}
|
||||
|
||||
var mysqlCollationIdentifier = regexp.MustCompile(`^[a-zA-Z0-9_]+$`)
|
||||
|
||||
// 历史域名主键继承建库时的排序规则,不能假定它与后来的项目标识相同。
|
||||
// 仅让新外键列匹配父列;不修改父表、数据库默认值或已有冲突表。
|
||||
func mysqlDomainDNSCreateStatement(ctx context.Context, db *sql.DB, statement string) (string, string, error) {
|
||||
var columnType, charset, collation string
|
||||
if err := db.QueryRowContext(ctx, `SELECT column_type, character_set_name, collation_name
|
||||
FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'domains' AND column_name = 'id'`).Scan(&columnType, &charset, &collation); err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
if !strings.EqualFold(columnType, "varchar(36)") || !mysqlCollationIdentifier.MatchString(charset) || !mysqlCollationIdentifier.MatchString(collation) {
|
||||
return "", "", fmt.Errorf("历史域名主键字符定义不受支持,拒绝修改现有结构")
|
||||
}
|
||||
const original = "domain_id VARCHAR(36) NOT NULL"
|
||||
if strings.Count(statement, original) != 1 {
|
||||
return "", "", fmt.Errorf("域名 DNS 绑定迁移主键定义不完整")
|
||||
}
|
||||
definition := "domain_id VARCHAR(36) CHARACTER SET " + charset + " COLLATE " + collation + " NOT NULL"
|
||||
return strings.Replace(statement, original, definition, 1), collation, nil
|
||||
}
|
||||
|
||||
func validateMySQLDomainDNSForeignKeys(ctx context.Context, db *sql.DB) (map[string]bool, error) {
|
||||
rows, err := db.QueryContext(ctx, `SELECT r.constraint_name, r.delete_rule, r.update_rule,
|
||||
k.column_name, k.referenced_table_schema, k.referenced_table_name, k.referenced_column_name,
|
||||
|
||||
Reference in new issue
Block a user