b7acfc0eef
本批两件事,加上随本批一起入仓的并行会话在制品: 一、菜单权限按公司隔离(批次 6) - V149 给 columns 加 company_id:先可空加列(末位、ALGORITHM=INSTANT)→ 回填公司 1 → MODIFY 收紧 NOT NULL;三段式缺一即撞 1048。同时建 (company_id, column_key) 复合键、 把公司 2 的 16 笔授权按 column_key 改指向它自己的副本,三类 menu_type 全复制, admin_companies 作为角色内生闸门行不复制(D3)。 - 第三道归属门 PermissionMenuService.resolveScopeCompanyId:站点超管可带 company_id 读写任意公司,非超管锁本公司、越界 403。它注册进 CompanyIdParamGoesThroughReadScopeTest 的 SCOPE_DOORS,四条判据与 readScope / readCompanyIdOrOwn 共用——护栏在代码出口,不靠清单。 - 旁路种子 PermissionMenuSchemaInitializer 只种公司 1:31 段种子逐条钉公司, 按 column_key 点查的 14 段全部带 company_id,否则摘了 DEFAULT 就是跨公司串写。 - CompanyService.create 同一次写入里给新公司复制模板树(D4)。 二、公司 tab 收口(批次 b) tab 条挂在壳层,对 22 页全画;改为按正列表 companyTabAppliesTo(menuKey) 判定, 只有注册表页渲染。护栏钉在用户看见的那个出口。 三、并行会话在制品(控制方「全部提交」,未单独拆分——见下) - V150 店铺密钥 biz_shop_key 按公司(readCompanyIdOrOwn + writeCompanyId 两道门) - V151 品牌库/商品类目推翻为全平台共享:只退唯一键、company_id DEFAULT 保留为 NOT NULL 承重约束(摘了每条 1364);删掉 ProductCategoryControllerCompanyScopeTest 那支"按公司隔离"的旧护栏,readCompanyId 方法一并移除 - invalidasin 字段与外观专利合批的连带改动 为什么不拆笔:后端 3891 例 / 0 红、前端 1731 例 / 0 红这两个读数是"合起来的树"的读数, 拆成多笔会让每一笔落到从未一起验过的组合上,而这一版要直接上两台。 回滚脚本在 backend-java/docs/rollback-V149/V150/V151-*.sql,不放进 Flyway 扫描路径。 设计记录:docs/ops/menu-company-tree-design-2026-10-06.md
150 lines
7.7 KiB
SQL
150 lines
7.7 KiB
SQL
-- =============================================================
|
||
-- 回滚补丁 V149__permission_menu_company_tree(人工执行,故意放在 Flyway 扫描路径之外)
|
||
-- 对应迁移:src/main/resources/db/V149__permission_menu_company_tree.sql
|
||
-- 设计:crawler-plugin/docs/ops/menu-company-tree-design-2026-10-06.md §9
|
||
--
|
||
-- 【为什么不是 V150】src/main/resources/db/ 是 Flyway 扫描路径,任何 V*.sql 都会在应用下次启动时
|
||
-- 自动执行。把回滚编成版本化迁移,等于让"决定回滚"这件事在没有人工执行的情况下自己发生。
|
||
--
|
||
-- 【执行顺序,一步不能换】
|
||
-- 1) 停两台 java(/api 经主机 B 的 clb 打到两台,留一台跑旧 jar 会让回滚中途被写入)
|
||
-- 2) 先跑第 0 段的两个 COUNT,把数记下来 —— 第 3 段判据要用它
|
||
-- 3) 跑本脚本(第 1..7 段)
|
||
-- 4) 删 flyway_schema_history 的 version=149 行(第 8 段;漏掉这步,将来重装时 Flyway
|
||
-- 见"已应用"会跳过 V149,回滚就白做了一半)
|
||
-- 5) 回滚 jar 到与本批不兼容的上一版(即只认 V147 及更早、columns 还没有 company_id 的那版构建;
|
||
-- V148 是已退役空号,不存在对应 jar —— 号位以 docs/migration-inventory.md 为准)
|
||
-- 6) 起应用
|
||
--
|
||
-- 【顺序上的唯一陷阱:必须先重指授权、后删副本】
|
||
-- user_column_permission 的 FK 是 ON DELETE CASCADE:直接 DELETE 副本行会把它名下所有授权
|
||
-- 一起删光 —— 而 V149 之后账号名下"本来就该"挂的是副本行。所以第 2 段先按 column_key 把指针
|
||
-- 挪回公司 1 的源行,第 3 段才敢删副本。这两段写反 = 把 133 只账号的菜单全清掉。
|
||
-- =============================================================
|
||
|
||
-- ---------- 0. 回滚前取证(只读,先把这两个数抄下来) ----------
|
||
|
||
-- 0a 副本行数(V149 后应 = 公司数-1 家 × 51)
|
||
SELECT 'V149_ROLLBACK_PRE copy_rows' AS marker, COUNT(*) AS rows_to_delete
|
||
FROM `columns` WHERE company_id <> 1;
|
||
|
||
-- 0b 挂在副本上的授权数(这些是回滚后必须回到源行的那批)
|
||
SELECT 'V149_ROLLBACK_PRE grants_on_copies' AS marker, COUNT(*) AS grants_to_repoint
|
||
FROM `user_column_permission` g
|
||
JOIN `users` u ON u.id = g.user_id
|
||
JOIN `columns` c ON c.id = g.column_id
|
||
WHERE c.company_id <> 1;
|
||
|
||
-- ---------- 1. 备份(两张都整表抄,回滚失败时按 <表名>_bak_v149_rollback 反插) ----------
|
||
-- 必须显式建、不要依赖 mysqldump:这两张表小(52+ 行 / 784 行),同库内备份是秒级,
|
||
-- 而"删完才发现判据错"的唯一出路就是这里有原样一份。
|
||
|
||
CREATE TABLE IF NOT EXISTS `columns_bak_v149_rollback` AS SELECT * FROM `columns`;
|
||
CREATE TABLE IF NOT EXISTS `user_column_permission_bak_v149_rollback` AS SELECT * FROM `user_column_permission`;
|
||
|
||
-- ---------- 2. 授权指针挪回公司 1 的源行 ----------
|
||
|
||
-- 2a 先去重:同一账号若同时挂着源行与副本(正常不会有,属 repair 中途态),删副本那一侧,
|
||
-- 留源行那一侧给 2b 判定,避免 2b 撞 PK (user_id, column_id) 报 1062。
|
||
DELETE dup FROM `user_column_permission` dup
|
||
JOIN `users` u ON u.id = dup.user_id
|
||
JOIN `columns` copy ON copy.id = dup.column_id AND copy.company_id = u.company_id
|
||
JOIN `columns` src ON src.id <> copy.id AND src.column_key = copy.column_key AND src.company_id = 1
|
||
JOIN `user_column_permission` old ON old.user_id = dup.user_id AND old.column_id = src.id;
|
||
|
||
-- 2b 重指回源行。
|
||
UPDATE `user_column_permission` g
|
||
JOIN `columns` copy ON copy.id = g.column_id AND copy.company_id <> 1
|
||
JOIN `columns` src ON src.company_id = 1 AND src.column_key = copy.column_key
|
||
SET g.column_id = src.id;
|
||
|
||
-- 2c 闸门:此时绝不允许再有"授权指向非 1 公司的行"。不为 0 就是 2b 漏了行,
|
||
-- 下一步的 CASCADE 会把它们静默删掉 —— 宁可这里报错停下,也不要少一批菜单而没人知道。
|
||
CREATE TEMPORARY TABLE `_v149_rb_gate` (`must_be_zero` INT NOT NULL);
|
||
INSERT INTO `_v149_rb_gate`
|
||
SELECT IF(COUNT(*) = 0, 0, NULL)
|
||
FROM (
|
||
SELECT g.user_id FROM `user_column_permission` g
|
||
JOIN `columns` c ON c.id = g.column_id
|
||
WHERE c.company_id <> 1
|
||
) bad;
|
||
DROP TEMPORARY TABLE `_v149_rb_gate`;
|
||
|
||
-- ---------- 3. 删副本 ----------
|
||
|
||
DELETE FROM `columns` WHERE company_id <> 1;
|
||
|
||
-- ---------- 4. 换回两条全平台唯一键(副本已删,源行本来就唯一 ⇒ 不会因重复失败) ----------
|
||
|
||
SET @db_name = DATABASE();
|
||
|
||
SET @idx_exists := (SELECT COUNT(DISTINCT INDEX_NAME) FROM information_schema.STATISTICS
|
||
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'columns' AND INDEX_NAME = 'uk_column_key');
|
||
SET @sql := IF(@idx_exists = 0,
|
||
'ALTER TABLE `columns` ADD UNIQUE KEY `uk_column_key` (`column_key`)',
|
||
'SELECT 1');
|
||
PREPARE stmt FROM @sql;
|
||
EXECUTE stmt;
|
||
DEALLOCATE PREPARE stmt;
|
||
|
||
SET @idx_exists := (SELECT COUNT(DISTINCT INDEX_NAME) FROM information_schema.STATISTICS
|
||
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'columns' AND INDEX_NAME = 'uk_menu_type_route_path');
|
||
SET @sql := IF(@idx_exists = 0,
|
||
'ALTER TABLE `columns` ADD UNIQUE KEY `uk_menu_type_route_path` (`menu_type`, `route_path`)',
|
||
'SELECT 1');
|
||
PREPARE stmt FROM @sql;
|
||
EXECUTE stmt;
|
||
DEALLOCATE PREPARE stmt;
|
||
|
||
-- ---------- 5. 摘掉两条按公司的新键 ----------
|
||
|
||
SET @idx_exists := (SELECT COUNT(DISTINCT INDEX_NAME) FROM information_schema.STATISTICS
|
||
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'columns' AND INDEX_NAME = 'uk_company_column_key');
|
||
SET @sql := IF(@idx_exists = 1, 'ALTER TABLE `columns` DROP INDEX `uk_company_column_key`', 'SELECT 1');
|
||
PREPARE stmt FROM @sql;
|
||
EXECUTE stmt;
|
||
DEALLOCATE PREPARE stmt;
|
||
|
||
SET @idx_exists := (SELECT COUNT(DISTINCT INDEX_NAME) FROM information_schema.STATISTICS
|
||
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'columns'
|
||
AND INDEX_NAME = 'uk_company_menu_type_route_path');
|
||
SET @sql := IF(@idx_exists = 1, 'ALTER TABLE `columns` DROP INDEX `uk_company_menu_type_route_path`', 'SELECT 1');
|
||
PREPARE stmt FROM @sql;
|
||
EXECUTE stmt;
|
||
DEALLOCATE PREPARE stmt;
|
||
|
||
-- ---------- 6. 删列 ----------
|
||
|
||
SET @col_exists := (SELECT COUNT(*) FROM information_schema.COLUMNS
|
||
WHERE TABLE_SCHEMA = @db_name AND TABLE_NAME = 'columns' AND COLUMN_NAME = 'company_id');
|
||
SET @sql := IF(@col_exists = 1, 'ALTER TABLE `columns` DROP COLUMN `company_id`', 'SELECT 1');
|
||
PREPARE stmt FROM @sql;
|
||
EXECUTE stmt;
|
||
DEALLOCATE PREPARE stmt;
|
||
|
||
-- ---------- 7. 复验(三条读数抄进回滚记录) ----------
|
||
|
||
-- 列已删(应 0 行)
|
||
SELECT 'V149_ROLLBACK_POST company_col' AS marker, COUNT(*) AS col_still_there
|
||
FROM information_schema.COLUMNS
|
||
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'columns' AND COLUMN_NAME = 'company_id';
|
||
|
||
-- 两条旧键在、两条新键没了(应恰好 4 行且 NON_UNIQUE 全 0)
|
||
SELECT 'V149_ROLLBACK_POST indexes' AS marker, INDEX_NAME,
|
||
GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX) AS cols, NON_UNIQUE
|
||
FROM information_schema.STATISTICS
|
||
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'columns' AND NON_UNIQUE = 0
|
||
GROUP BY INDEX_NAME, NON_UNIQUE;
|
||
|
||
SELECT 'V149_ROLLBACK_POST rows' AS marker, COUNT(*) AS rows_now FROM `columns`;
|
||
SELECT 'V149_ROLLBACK_POST grants' AS marker, COUNT(*) AS grants_now FROM `user_column_permission`;
|
||
|
||
-- ---------- 8. 删 Flyway 历史行(漏掉 = 重装时 V149 被跳过) ----------
|
||
|
||
DELETE FROM `flyway_schema_history` WHERE `version` = '149';
|
||
|
||
-- ---------- 9. 回滚后的语义,写明别当 bug ----------
|
||
-- 公司 2 的 2 只账号回到 V149 之前的状态:授权挂在公司 1 的行上,两家共用一棵树。
|
||
-- 跨公司串扰因此重新发生(这本来就是回滚的代价),而 columns 表回到全平台唯一键。
|
||
-- 备份表 columns_bak_v149_rollback / user_column_permission_bak_v149_rollback 确认无误后手工 DROP。
|