Skip to content

Commit 6f6a816

Browse files
committed
rebase master
1 parent 02ae335 commit 6f6a816

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

sql/notify.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
)
2828
from sql.utils.resource_group import auth_group_users
2929
from sql.utils.workflow_audit import Audit
30-
from sql_api.serializers import (
30+
from sql_api.serializers.serializers import (
3131
WorkflowContentSerializer,
3232
WorkflowAuditListSerializer,
3333
QueryPrivilegesApplySerializer,

sql_api/serializers/sql_workflow.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from rest_framework import serializers
1919

2020
from common.config import SysConfig
21-
from common.utils.const import WorkflowDict
2221
from sql.engines import ReviewSet, get_engine
2322
from sql.engines.models import ReviewResult
2423
from sql.models import Instance, SqlWorkflow, Users
@@ -256,7 +255,9 @@ def mysql_osc_control(obj, sqlsha1, command):
256255
"""用于MySQL的大表DDL控制"""
257256
execute_engine = get_engine(instance=obj.instance)
258257
try:
259-
execute_result = execute_engine.osc_control(command=command, sqlsha1=sqlsha1)
258+
execute_result = execute_engine.osc_control(
259+
command=command, sqlsha1=sqlsha1
260+
)
260261
rows = execute_result.to_dict()
261262
error = execute_result.error
262263
except Exception as e:
@@ -296,5 +297,6 @@ class SqlWorkflowMySQLOscControlSerializer(serializers.Serializer):
296297
label="SQL审核返回的sqlsha1信息",
297298
)
298299
command = serializers.ChoiceField(
299-
choices=["get", "pause", "resume", "kill"], label="命令:get-获取详情,pause-暂停,resume-恢复,kill-终止"
300+
choices=["get", "pause", "resume", "kill"],
301+
label="命令:get-获取详情,pause-暂停,resume-恢复,kill-终止",
300302
)

0 commit comments

Comments
 (0)