fix: 修复授权时数据库出现特殊字符失败 TencentBlueKing#7200

Jackvideo · Sep 30, 2024 · 72f4a38 · 72f4a38
1 parent fce8454
commit 72f4a38
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/dbm-services/mysql/db-priv/service/add_priv_base_func_for_sqlserver.go b/dbm-services/mysql/db-priv/service/add_priv_base_func_for_sqlserver.go
@@ -135,7 +135,7 @@ func GenerateSqlserverSQL(account TbAccounts, rules []TbAccountRules, address st
 			}
 			// 拼接db级别的授权语句
 			for _, dbName := range realDBS {
-				sqls = append(sqls, fmt.Sprintf(`USE %s
+				sqls = append(sqls, fmt.Sprintf(`USE [%s]
 	ALTER AUTHORIZATION ON SCHEMA::db_owner TO dbo;
 	IF EXISTS (SELECT 1 FROM [%s].sys.database_principals WHERE name = N'%s') 
 	BEGIN 
@@ -148,7 +148,7 @@ func GenerateSqlserverSQL(account TbAccounts, rules []TbAccountRules, address st
 	`,
 					dbName, dbName, account.User, dbName, account.User, account.User, account.User,
 				))
-				sqls = append(sqls, fmt.Sprintf("USE %s", dbName))
+				sqls = append(sqls, fmt.Sprintf("USE [%s]", dbName))
 				for _, p := range strings.Split(rule.Priv, ",") {
 					sqls = append(sqls, fmt.Sprintf("EXEC SP_ADDROLEMEMBER N'%s', N'%s';", p, account.User))
 				}

diff --git a/dbm-services/sqlserver/db-tools/dbactuator/pkg/components/sqlserver/rename_dbs.go b/dbm-services/sqlserver/db-tools/dbactuator/pkg/components/sqlserver/rename_dbs.go
@@ -159,7 +159,7 @@ func (r *RenameDBSComp) DoRenameDBWithMirroring() error {
 		if cnt != 0 {
 			execDBSQLs = append(execDBSQLs, fmt.Sprintf("ALTER DATABASE [%s] SET PARTNER OFF;", i.DBName))
 		}
-		execDBSQLs = append(execDBSQLs, fmt.Sprintf("ALTER DATABASE [%s] MODIFY NAME = %s", i.DBName, i.TargetDBName))
+		execDBSQLs = append(execDBSQLs, fmt.Sprintf("ALTER DATABASE [%s] MODIFY NAME = [%s]", i.DBName, i.TargetDBName))
 		// 执行rename 命令
 		if _, err := r.DB.ExecMore(execDBSQLs); err != nil {
 			logger.Error(
@@ -209,7 +209,7 @@ func (r *RenameDBSComp) DoRenameDBWithAlwayson() error {
 		}
 		execDBSQLs = append(
 			execDBSQLs,
-			fmt.Sprintf("ALTER DATABASE [%s] MODIFY NAME = %s;", i.DBName, i.TargetDBName),
+			fmt.Sprintf("ALTER DATABASE [%s] MODIFY NAME = [%s];", i.DBName, i.TargetDBName),
 		)
 		// 执行rename 命令
 		if _, err := r.DB.ExecMore(execDBSQLs); err != nil {

diff --git a/dbm-services/sqlserver/db-tools/dbactuator/pkg/core/staticembed/monitor_dbm.sql b/dbm-services/sqlserver/db-tools/dbactuator/pkg/core/staticembed/monitor_dbm.sql
@@ -960,14 +960,14 @@ BEGIN
 			BEGIN
 				IF EXISTS (SELECT name FROM sys.databases WHERE name = @dr)
 				BEGIN
-					SET @cmd='DROP DATABASE '+@dr
+					SET @cmd='DROP DATABASE ['+@dr+']'
 					EXEC (@cmd)
 
 					SET @cmd2='EXEC MASTER.DBO.xp_cmdshell ''del /q d:\gamedb\'+@dr+'.'+@port+'.*.spst'';'
 					EXEC (@cmd2)
 				END
 
-				select @filename=null,@cmd='',@fileid=0,@cmd='CREATE DATABASE '+@dr+' ON '
+				select @filename=null,@cmd='',@fileid=0,@cmd='CREATE DATABASE ['+@dr+'] ON '
 				declare cur1 cursor for select name from sys.master_files where database_id=@dbid and type_desc='ROWS' and state_desc='ONLINE'
 				open cur1
 				while 1=1
@@ -981,7 +981,7 @@ BEGIN
 				close cur1
 				deallocate cur1	
 
-				set @cmd=left(@cmd,len(@cmd)-1)+' AS SNAPSHOT OF '+@db    
+				set @cmd=left(@cmd,len(@cmd)-1)+' AS SNAPSHOT OF ['+@db+']'
 
 				BEGIN TRY
 					EXEC (@cmd)
@@ -2728,7 +2728,7 @@ BEGIN TRY
 		WHILE @@FETCH_STATUS = 0
 		BEGIN
 				--强制故障切换
-				set @strsql='Use master  alter database '+@dbname+' set partner FORCE_SERVICE_ALLOW_DATA_LOSS;'
+				set @strsql='Use master  alter database ['+@dbname+'] set partner FORCE_SERVICE_ALLOW_DATA_LOSS;'
 				exec(@strsql)
 				if @@error>0
 				begin
@@ -2936,7 +2936,7 @@ BEGIN TRY
 		WHILE @@FETCH_STATUS = 0
 		BEGIN
 				--强制故障切换
-				set @strsql='Use master  alter database '+@dbname+' set partner FORCE_SERVICE_ALLOW_DATA_LOSS;'
+				set @strsql='Use master  alter database ['+@dbname+'] set partner FORCE_SERVICE_ALLOW_DATA_LOSS;'
 				exec(@strsql)
 				if @@error>0
 				begin

diff --git a/dbm-ui/backend/db_meta/api/cluster/sqlserverha/create_cluster.py b/dbm-ui/backend/db_meta/api/cluster/sqlserverha/create_cluster.py
@@ -146,7 +146,7 @@ def create(
         m.db_module_id = db_module_id
         # 保存最新的time_zone
         ins.time_zone = get_instance_time_zone(ins)
-        ins.save(update_fields=["db_module_id"])
-        m.save(update_fields=["db_module_id"])
+        ins.save()
+        m.save()
 
     return cluster
diff --git a/dbm-ui/backend/db_meta/api/cluster/sqlserverha/handler.py b/dbm-ui/backend/db_meta/api/cluster/sqlserverha/handler.py
@@ -305,8 +305,8 @@ def switch_slave(
             )[0]
             new_slave_obj.db_module_id = cluster.db_module_id
             new_slave_obj.machine.db_module_id = cluster.db_module_id
-            new_slave_obj.save(update_fields=["db_module_id"])
-            new_slave_obj.machine.save(update_fields=["db_module_id"])
+            new_slave_obj.save()
+            new_slave_obj.machine.save()
             cluster.storageinstance_set.add(new_slave_obj)
 
             # 切换slave域名信息