From a1a080b0cb358ce8d8c4756e8a3b65fa5596faa8 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 13 May 2024 11:40:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20sq=E5=8D=87=E7=BA=A7=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BD=93=E6=9B=B4=E6=96=B0=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/upgrade/upg_ne_info.sql | 2 +- database/upgrade/upg_ne_license.sql | 42 ++++++++++++++-------------- database/upgrade/upg_ne_software.sql | 22 +++++++-------- database/upgrade/upg_ne_version.sql | 27 +++++++++--------- 4 files changed, 46 insertions(+), 47 deletions(-) diff --git a/database/upgrade/upg_ne_info.sql b/database/upgrade/upg_ne_info.sql index b8be038b..8bf0da87 100644 --- a/database/upgrade/upg_ne_info.sql +++ b/database/upgrade/upg_ne_info.sql @@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `ne_info` ( -- 20240511前旧表更新 ALTER TABLE `ne_info` COMMENT = '网元信息表 对应一个网元版本、网元授权、网元主机'; -ALTER TABLE `ne_info` ADD COLUMN `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `update_time`; +ALTER TABLE `ne_info` ADD COLUMN IF NOT EXISTS `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `update_time`; ALTER TABLE `ne_info` MODIFY COLUMN `pv_flag` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'PNF' COMMENT '\'PNF\',\'VNF\'' AFTER `port`; ALTER TABLE `ne_info` MODIFY COLUMN `province` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '省份地域' AFTER `pv_flag`; ALTER TABLE `ne_info` MODIFY COLUMN `ne_address` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'MAC地址' AFTER `dn`; diff --git a/database/upgrade/upg_ne_license.sql b/database/upgrade/upg_ne_license.sql index a01f81cb..6e3aad74 100644 --- a/database/upgrade/upg_ne_license.sql +++ b/database/upgrade/upg_ne_license.sql @@ -23,30 +23,30 @@ CREATE TABLE IF NOT EXISTS `ne_license` ( -- 20240511前旧表更新 ALTER TABLE `ne_license` COMMENT = '网元授权激活信息'; -ALTER TABLE `ne_license` ADD COLUMN `activation_request_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '激活申请代码' AFTER `ne_id`; -ALTER TABLE `ne_license` ADD COLUMN `license_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '激活授权文件' AFTER `activation_request_code`; -ALTER TABLE `ne_license` ADD COLUMN `serial_num` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '序列号' AFTER `license_path`; -ALTER TABLE `ne_license` ADD COLUMN `expiry_date` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '许可证到期日期' AFTER `serial_num`; -ALTER TABLE `ne_license` ADD COLUMN `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `status`; -ALTER TABLE `ne_license` ADD COLUMN `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者' AFTER `remark`; -ALTER TABLE `ne_license` ADD COLUMN `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间' AFTER `create_by`; -ALTER TABLE `ne_license` ADD COLUMN `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `create_time`; -ALTER TABLE `ne_license` ADD COLUMN `update_time` bigint NULL DEFAULT 0 COMMENT '更新时间' AFTER `update_by`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `activation_request_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '激活申请代码' AFTER `ne_id`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `license_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '激活授权文件' AFTER `activation_request_code`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `serial_num` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '序列号' AFTER `license_path`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `expiry_date` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '许可证到期日期' AFTER `serial_num`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注' AFTER `status`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者' AFTER `remark`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间' AFTER `create_by`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `create_time`; +ALTER TABLE `ne_license` ADD COLUMN IF NOT EXISTS `update_time` bigint NULL DEFAULT 0 COMMENT '更新时间' AFTER `update_by`; ALTER TABLE `ne_license` MODIFY COLUMN `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型' AFTER `id`; ALTER TABLE `ne_license` MODIFY COLUMN `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID' AFTER `ne_type`; ALTER TABLE `ne_license` MODIFY COLUMN `status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '状态 0无效 1有效' AFTER `expiry_date`; -ALTER TABLE `ne_license` DROP COLUMN `serial_no`; -ALTER TABLE `ne_license` DROP COLUMN `capcity`; -ALTER TABLE `ne_license` DROP COLUMN `used`; -ALTER TABLE `ne_license` DROP COLUMN `feature_enabled`; -ALTER TABLE `ne_license` DROP COLUMN `expiration_date`; -ALTER TABLE `ne_license` DROP COLUMN `path`; -ALTER TABLE `ne_license` DROP COLUMN `file_name`; -ALTER TABLE `ne_license` DROP COLUMN `comment`; -ALTER TABLE `ne_license` DROP COLUMN `created_at`; -ALTER TABLE `ne_license` DROP COLUMN `updated_at`; -ALTER TABLE `ne_license` DROP COLUMN `deleted_at`; -ALTER TABLE `ne_license` ADD UNIQUE INDEX `uk_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE COMMENT '唯一网元类型和网元ID'; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `serial_no`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `capcity`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `used`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `feature_enabled`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `expiration_date`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `path`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `file_name`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `comment`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `created_at`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `updated_at`; +ALTER TABLE `ne_license` DROP COLUMN IF EXISTS `deleted_at`; +ALTER TABLE `ne_license` ADD UNIQUE INDEX IF NOT EXISTS `uk_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE COMMENT '唯一网元类型和网元ID'; SET FOREIGN_KEY_CHECKS=1; diff --git a/database/upgrade/upg_ne_software.sql b/database/upgrade/upg_ne_software.sql index 0559735d..fed4d7b7 100644 --- a/database/upgrade/upg_ne_software.sql +++ b/database/upgrade/upg_ne_software.sql @@ -20,20 +20,20 @@ CREATE TABLE IF NOT EXISTS `ne_software` ( -- 20240511前旧表更新 ALTER TABLE `ne_software` COMMENT = '网元软件包'; -ALTER TABLE `ne_software` ADD COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '包名称' AFTER `ne_type`; -ALTER TABLE `ne_software` ADD COLUMN `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '包说明' AFTER `version`; -ALTER TABLE `ne_software` ADD COLUMN `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者' AFTER `description`; -ALTER TABLE `ne_software` ADD COLUMN `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间' AFTER `create_by`; -ALTER TABLE `ne_software` ADD COLUMN `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `create_time`; +ALTER TABLE `ne_software` ADD COLUMN IF NOT EXISTS `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '包名称' AFTER `ne_type`; +ALTER TABLE `ne_software` ADD COLUMN IF NOT EXISTS `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '包说明' AFTER `version`; +ALTER TABLE `ne_software` ADD COLUMN IF NOT EXISTS `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者' AFTER `description`; +ALTER TABLE `ne_software` ADD COLUMN IF NOT EXISTS `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间' AFTER `create_by`; +ALTER TABLE `ne_software` ADD COLUMN IF NOT EXISTS `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `create_time`; ALTER TABLE `ne_software` MODIFY COLUMN `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型' AFTER `id`; ALTER TABLE `ne_software` MODIFY COLUMN `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '包路径' AFTER `name`; ALTER TABLE `ne_software` MODIFY COLUMN `version` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '包版本' AFTER `path`; ALTER TABLE `ne_software` MODIFY COLUMN `update_time` bigint NULL DEFAULT 0 COMMENT '更新时间' AFTER `update_by`; -ALTER TABLE `ne_software` DROP COLUMN `file_name`; -ALTER TABLE `ne_software` DROP COLUMN `md5_sum`; -ALTER TABLE `ne_software` DROP COLUMN `status`; -ALTER TABLE `ne_software` DROP COLUMN `comment`; -ALTER TABLE `ne_software` DROP COLUMN `patch_time`; -ALTER TABLE `ne_software` ADD UNIQUE INDEX `uk_type_name_version`(`ne_type` ASC, `name` ASC, `version` ASC) USING BTREE COMMENT '唯一网元类型和文件名版本是否唯一'; +ALTER TABLE `ne_software` DROP COLUMN IF EXISTS `file_name`; +ALTER TABLE `ne_software` DROP COLUMN IF EXISTS `md5_sum`; +ALTER TABLE `ne_software` DROP COLUMN IF EXISTS `status`; +ALTER TABLE `ne_software` DROP COLUMN IF EXISTS `comment`; +ALTER TABLE `ne_software` DROP COLUMN IF EXISTS `patch_time`; +ALTER TABLE `ne_software` ADD UNIQUE INDEX IF NOT EXISTS `uk_type_name_version`(`ne_type` ASC, `name` ASC, `version` ASC) USING BTREE COMMENT '唯一网元类型和文件名版本是否唯一'; SET FOREIGN_KEY_CHECKS=1; diff --git a/database/upgrade/upg_ne_version.sql b/database/upgrade/upg_ne_version.sql index 2b63a459..29eb4b9e 100644 --- a/database/upgrade/upg_ne_version.sql +++ b/database/upgrade/upg_ne_version.sql @@ -27,15 +27,15 @@ CREATE TABLE IF NOT EXISTS `ne_version` ( -- 20240511前旧表更新 ALTER TABLE `ne_version` COMMENT = '网元版本信息'; -ALTER TABLE `ne_version` ADD COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '当前包名' AFTER `ne_id`; -ALTER TABLE `ne_version` ADD COLUMN `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '当前软件包' AFTER `version`; -ALTER TABLE `ne_version` ADD COLUMN `pre_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上一版本包名' AFTER `path`; -ALTER TABLE `ne_version` ADD COLUMN `pre_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '上一版本软件包' AFTER `pre_version`; -ALTER TABLE `ne_version` ADD COLUMN `new_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '新版本报名' AFTER `pre_path`; -ALTER TABLE `ne_version` ADD COLUMN `new_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '新版软件包' AFTER `new_version`; -ALTER TABLE `ne_version` ADD COLUMN `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者' AFTER `status`; -ALTER TABLE `ne_version` ADD COLUMN `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间' AFTER `create_by`; -ALTER TABLE `ne_version` ADD COLUMN `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `create_time`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '当前包名' AFTER `ne_id`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '当前软件包' AFTER `version`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `pre_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上一版本包名' AFTER `path`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `pre_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '上一版本软件包' AFTER `pre_version`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `new_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '新版本报名' AFTER `pre_path`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `new_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '新版软件包' AFTER `new_version`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者' AFTER `status`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `create_time` bigint NULL DEFAULT 0 COMMENT '创建时间' AFTER `create_by`; +ALTER TABLE `ne_version` ADD COLUMN IF NOT EXISTS `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者' AFTER `create_time`; ALTER TABLE `ne_version` MODIFY COLUMN `ne_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元类型' AFTER `id`; ALTER TABLE `ne_version` MODIFY COLUMN `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网元ID' AFTER `ne_type`; ALTER TABLE `ne_version` MODIFY COLUMN `version` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '当前版本' AFTER `name`; @@ -43,10 +43,9 @@ ALTER TABLE `ne_version` MODIFY COLUMN `pre_version` varchar(64) CHARACTER SET u ALTER TABLE `ne_version` MODIFY COLUMN `new_version` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '新版本' AFTER `new_name`; ALTER TABLE `ne_version` MODIFY COLUMN `status` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '当前状态 1当前版本 2上一版本 3有新版本' AFTER `new_path`; ALTER TABLE `ne_version` MODIFY COLUMN `update_time` bigint NULL DEFAULT 0 COMMENT '更新时间' AFTER `update_by`; -ALTER TABLE `ne_version` DROP COLUMN `file_path`; -ALTER TABLE `ne_version` DROP COLUMN `pre_file`; -ALTER TABLE `ne_version` DROP COLUMN `new_file`; -ALTER TABLE `ne_version` ADD UNIQUE INDEX `uk_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE COMMENT '唯一网元类型和ID'; - +ALTER TABLE `ne_version` DROP COLUMN IF EXISTS `file_path`; +ALTER TABLE `ne_version` DROP COLUMN IF EXISTS `pre_file`; +ALTER TABLE `ne_version` DROP COLUMN IF EXISTS `new_file`; +ALTER TABLE `ne_version` ADD UNIQUE INDEX IF NOT EXISTS `uk_type_id`(`ne_type` ASC, `ne_id` ASC) USING BTREE COMMENT '唯一网元类型和ID'; SET FOREIGN_KEY_CHECKS=1;