pro/im_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mysql tenant database schema cleanup

Browse Source
This commit is contained in:
richjohnrambo
2026-08-15 15:48:17 +08:00
parent 672fc68cfa
commit d8d1639d5b
6 changed files with 868 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/apply_hotgo_tenant_db.go
+5 -74
View File
@@ -57,48 +57,9 @@ func main() {
CONSTRAINT fk_im_tenant_config_tenant FOREIGN KEY(tenant_id) REFERENCES hotgo.im_tenant(id) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
"CREATE DATABASE IF NOT EXISTS tinode CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci",
// The main server binary only creates tinode.im_tenant/im_tenant_config
// (see createTenantRegistry in server/db/mysql/adapter.go) as part of its
// version-gated schema upgrade chain. A tinode DB that was already at the
// target schema version before this table was introduced never runs that
// step, so the ALTERs below would otherwise fail with "table doesn't
// exist". Create it here too (schema kept identical to createTenantRegistry).
`CREATE TABLE IF NOT EXISTS tinode.im_tenant(
id BIGINT NOT NULL AUTO_INCREMENT,
code VARCHAR(64) NOT NULL,
name VARCHAR(128) NOT NULL,
tenant_desc VARCHAR(256),
db_name VARCHAR(128) NOT NULL DEFAULT '',
db_dsn VARCHAR(1024) NOT NULL DEFAULT '',
state SMALLINT NOT NULL,
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
created_by BIGINT NOT NULL,
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
updated_by BIGINT NOT NULL,
PRIMARY KEY(id),
UNIQUE INDEX uk_im_tenant_code(code),
INDEX idx_im_tenant_db_name(db_name)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
`CREATE TABLE IF NOT EXISTS tinode.im_tenant_config(
id BIGINT NOT NULL AUTO_INCREMENT,
tenant_id BIGINT NOT NULL,
max_users BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 means unlimited',
max_groups BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 means unlimited',
max_group_members INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 means unlimited',
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
created_by BIGINT NOT NULL,
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
updated_by BIGINT NOT NULL,
PRIMARY KEY(id),
UNIQUE INDEX uk_im_tenant_config_tenant_id(tenant_id),
CONSTRAINT fk_im_tenant_config_tenant FOREIGN KEY(tenant_id) REFERENCES tinode.im_tenant(id) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
`INSERT INTO tinode.im_tenant(id,code,name,tenant_desc,db_name,db_dsn,state,created_by,updated_by)
VALUES(1,'default','Default Tenant',NULL,'tinode','',1,0,0)
ON DUPLICATE KEY UPDATE db_name=VALUES(db_name), updated_at=CURRENT_TIMESTAMP(3)`,
// Same root cause as im_tenant above: createIMSecurityTables, createIMNotificationTables
// and createIMRelationTables (server/db/mysql/adapter.go) are only reached from CreateDb's
// fresh-install path, which our pre-existing tinode DB never runs. Recreate their tables here.
// createIMSecurityTables, createIMNotificationTables and createIMRelationTables
// (server/db/mysql/adapter.go) are only reached from CreateDb's fresh-install
// path, which our pre-existing tinode DB never runs. Recreate their tables here.
`CREATE TABLE IF NOT EXISTS tinode.im_realname_verifications(
id BIGINT NOT NULL AUTO_INCREMENT,
user_id BIGINT NOT NULL,
@@ -559,21 +520,10 @@ func main() {
"ALTER TABLE hotgo.im_tenant ADD COLUMN tenant_desc VARCHAR(256) AFTER name",
"ALTER TABLE hotgo.im_tenant ADD COLUMN db_name VARCHAR(128) NOT NULL DEFAULT '' AFTER tenant_desc",
"ALTER TABLE hotgo.im_tenant ADD COLUMN db_dsn VARCHAR(1024) NOT NULL DEFAULT '' AFTER db_name",
"ALTER TABLE tinode.im_tenant ADD COLUMN tenant_desc VARCHAR(256) AFTER name",
"ALTER TABLE tinode.im_tenant ADD COLUMN db_name VARCHAR(128) NOT NULL DEFAULT '' AFTER tenant_desc",
"ALTER TABLE tinode.im_tenant ADD COLUMN db_dsn VARCHAR(1024) NOT NULL DEFAULT '' AFTER db_name",
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN enabled TINYINT NOT NULL DEFAULT 0 AFTER password_hash",
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN policy_version INT NOT NULL DEFAULT 1 AFTER enabled",
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN restrictions JSON AFTER policy_version",
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN enabled_at DATETIME(3) AFTER restrictions",
// auth/credentials: server/db/mysql/adapter.go's CreateDb never defined a
// tenant_id column here even on a fresh install, yet every auth/credentials
// query unconditionally filters/inserts by tenant_id - a latent bug in the
// fresh-schema definition, not something version-skip alone explains. Backfill
// existing rows to the default tenant (id=1); adapter.go's CREATE TABLE was
// fixed alongside this to include the column on future fresh installs too.
"ALTER TABLE tinode.auth ADD COLUMN tenant_id BIGINT NOT NULL DEFAULT 1 AFTER id",
"ALTER TABLE tinode.credentials ADD COLUMN tenant_id BIGINT NOT NULL DEFAULT 1 AFTER id",
} {
if _, err = db.Exec(stmt); err != nil && !strings.Contains(err.Error(), "Duplicate column name") {
fatal(fmt.Errorf("exec failed: %s: %w", stmt, err))
@@ -611,9 +561,6 @@ func main() {
ON DUPLICATE KEY UPDATE updated_at=CURRENT_TIMESTAMP(3)`); err != nil {
fatal(err)
}
if _, err = db.Exec("UPDATE tinode.im_tenant SET db_name='tinode' WHERE code='default' AND (db_name='' OR db_name IS NULL)"); err != nil {
fatal(err)
}
if _, err = db.Exec(`INSERT INTO tinode.im_abuse_reasons(target_type,reason_code,label,requires_description,allows_evidence,sort_order)
VALUES
('user','fraud','诈骗欺诈',0,1,10),
@@ -644,13 +591,6 @@ func main() {
fatal(err)
}
fmt.Printf("hotgo.im_tenant default: code=%s db_name=%s state=%d\n", code, dbName, state)
var columnCount int
if err = db.QueryRow(`SELECT COUNT(*) FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA='tinode' AND TABLE_NAME='im_tenant' AND COLUMN_NAME IN ('tenant_desc','db_name','db_dsn')`).Scan(&columnCount); err != nil {
fatal(err)
}
fmt.Printf("tinode.im_tenant routing columns: %d/3\n", columnCount)
rows, err := db.Query(`SELECT table_name FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA='tinode' AND COLUMN_NAME='tenant_id'
ORDER BY table_name`)
@@ -681,17 +621,10 @@ func fatal(v any) {
os.Exit(1)
}
// keptTenantIDTables lists tables whose tenant_id column must survive
// dropTenantIDColumns: server/db/mysql/adapter.go queries auth and credentials
// by tenant_id unconditionally (not gated behind tenant_db_routing), so unlike
// the newer per-tenant-DB feature tables, these two are row-tagged by design.
var keptTenantIDTables = "'auth','credentials'"
func dropTenantIDColumns(db *sql.DB, schema string) error {
fks, err := queryPairs(db, `SELECT DISTINCT table_name, constraint_name
FROM information_schema.KEY_COLUMN_USAGE
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND REFERENCED_TABLE_NAME IS NOT NULL
AND table_name NOT IN (`+keptTenantIDTables+`)`,
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND REFERENCED_TABLE_NAME IS NOT NULL`,
schema)
if err != nil {
return err
@@ -704,8 +637,7 @@ func dropTenantIDColumns(db *sql.DB, schema string) error {
indexes, err := queryPairs(db, `SELECT DISTINCT table_name, index_name
FROM information_schema.STATISTICS
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND INDEX_NAME<>'PRIMARY'
AND table_name NOT IN (`+keptTenantIDTables+`)`,
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND INDEX_NAME<>'PRIMARY'`,
schema)
if err != nil {
return err
@@ -718,7 +650,6 @@ func dropTenantIDColumns(db *sql.DB, schema string) error {
rows, err := db.Query(`SELECT table_name FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id'
AND table_name NOT IN (`+keptTenantIDTables+`)
ORDER BY table_name`, schema)
if err != nil {
return err
scripts/apply_sql_file.go
+49
View File
@@ -0,0 +1,49 @@
//go:build ignore
package main
import (
"database/sql"
"fmt"
"os"
"strings"
_ "github.com/go-sql-driver/mysql"
)
func main() {
dsn := strings.TrimPrefix(os.Getenv("IM_MYSQL_DSN"), "mysql://")
sqlFile := os.Getenv("IM_SQL_FILE")
if dsn == "" || sqlFile == "" {
fatal("IM_MYSQL_DSN and IM_SQL_FILE are required")
}
if !strings.Contains(dsn, "multiStatements=") {
sep := "?"
if strings.Contains(dsn, "?") {
sep = "&"
}
dsn += sep + "multiStatements=true"
}
body, err := os.ReadFile(sqlFile)
if err != nil {
fatal(err)
}
db, err := sql.Open("mysql", dsn)
if err != nil {
fatal(err)
}
defer db.Close()
if err = db.Ping(); err != nil {
fatal(err)
}
if _, err = db.Exec(string(body)); err != nil {
fatal(err)
}
fmt.Println("applied", sqlFile)
}
func fatal(v any) {
fmt.Fprintln(os.Stderr, v)
os.Exit(1)
}
scripts/query_sql.go
+61
View File
@@ -0,0 +1,61 @@
//go:build ignore
package main
import (
"database/sql"
"fmt"
"os"
"strings"
_ "github.com/go-sql-driver/mysql"
)
func main() {
dsn := strings.TrimPrefix(os.Getenv("IM_MYSQL_DSN"), "mysql://")
query := os.Getenv("IM_SQL_QUERY")
if dsn == "" || query == "" {
fatal("IM_MYSQL_DSN and IM_SQL_QUERY are required")
}
db, err := sql.Open("mysql", dsn)
if err != nil {
fatal(err)
}
defer db.Close()
rows, err := db.Query(query)
if err != nil {
fatal(err)
}
defer rows.Close()
cols, err := rows.Columns()
if err != nil {
fatal(err)
}
fmt.Println(strings.Join(cols, "\t"))
for rows.Next() {
values := make([]sql.NullString, len(cols))
scan := make([]any, len(cols))
for i := range values {
scan[i] = &values[i]
}
if err := rows.Scan(scan...); err != nil {
fatal(err)
}
out := make([]string, len(cols))
for i, value := range values {
if value.Valid {
out[i] = value.String
}
}
fmt.Println(strings.Join(out, "\t"))
}
if err := rows.Err(); err != nil {
fatal(err)
}
}
func fatal(v any) {
fmt.Fprintln(os.Stderr, v)
os.Exit(1)
}