fix(backend): sqlserver serializer添加db正则字段 #5349

TencentBlueKing · Jul 4, 2024 · dde9cf2 · dde9cf2
1 parent f0442e4
commit dde9cf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/dbm-ui/backend/db_services/sqlserver/rollback/serializers.py b/dbm-ui/backend/db_services/sqlserver/rollback/serializers.py
@@ -47,7 +47,7 @@ class QueryDbsByBackupLogSerializer(serializers.Serializer):
     restore_time = DBTimezoneField(help_text=_("回档时间"), allow_blank=True, required=False)
 
     def validate(self, attrs):
-        if not attrs.get("backup_logs") and not attrs.get("rollback_time"):
+        if not attrs.get("backup_logs") and not attrs.get("restore_time"):
             raise serializers.ValidationError(_("请输入备份记录或者备份时间来查询操作库表"))
         if attrs.get("restore_time"):
             attrs["restore_time"] = str2datetime(attrs["restore_time"])

diff --git a/dbm-ui/backend/db_services/sqlserver/sql_import/handlers.py b/dbm-ui/backend/db_services/sqlserver/sql_import/handlers.py
@@ -44,7 +44,8 @@ def upload_sql_file(
         """
         # 逻辑同mysql的sql文件上传，直接复用即可
         sql_file_info_list = MySQLSQLHandler.upload_sql_file(BKREPO_SQLFILE_PATH, sql_content, sql_files)
-        sql_file_info_list[0]["raw_file_name"] = sql_file_info_list[0]["raw_file_name"].split("/")[-1]
+        for sql_file_info in sql_file_info_list:
+            sql_file_info["raw_file_name"] = sql_file_info["sql_path"].split("/")[-1]
         return sql_file_info_list
 
     @staticmethod

diff --git a/dbm-ui/backend/ticket/builders/sqlserver/sqlserver_backup.py b/dbm-ui/backend/ticket/builders/sqlserver/sqlserver_backup.py
@@ -23,6 +23,8 @@ class SQLServerBackupDetailSerializer(SQLServerBaseOperateDetailSerializer):
     class BackupDataInfoSerializer(serializers.Serializer):
         cluster_id = serializers.IntegerField(help_text=_("集群ID"))
         backup_dbs = serializers.ListField(help_text=_("备份db列表"), child=serializers.CharField())
+        db_list = serializers.ListField(help_text=_("库正则"), child=serializers.CharField(), required=False)
+        ignore_db_list = serializers.ListField(help_text=_("忽略库正则"), child=serializers.CharField(), required=False)
 
     backup_place = serializers.CharField(help_text=_("备份位置(先固定为master)"), required=False, default="master")
     backup_type = serializers.ChoiceField(