From d1391cb5d5b6902908926b419f92dfd9d7ecc46f Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Thu, 16 Nov 2023 16:08:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20sqlserver=20?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/models/job.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/ops/models/job.py b/apps/ops/models/job.py index 330bd4631..56d826e86 100644 --- a/apps/ops/models/job.py +++ b/apps/ops/models/job.py @@ -298,10 +298,18 @@ class JobExecution(JMSOrgBaseModel): db_module_name_map = { 'mysql': 'community.mysql.mysql_query', 'postgresql': 'community.postgresql.postgresql_query', - 'sqlserver': 'community.general.mssql_script:', + 'sqlserver': 'community.general.mssql_script', + } + extra_query_token_map = { + 'sqlserver': 'script' + } + extra_login_db_token_map = { + 'sqlserver': 'name' } if module in db_modules: + login_db_token = extra_login_db_token_map.get(module, 'login_db') + query_token = extra_query_token_map.get(module, 'query') module = db_module_name_map.get(module, None) if not module: print('not support db module: {}'.format(module)) @@ -311,8 +319,9 @@ class JobExecution(JMSOrgBaseModel): "login_user={{login_user}} " \ "login_password={{login_password}} " \ "login_port={{login_port}} " \ - "login_db={{login_db}}" - shell = "{} query=\"{}\" ".format(login_args, self.current_job.args) + "%s={{login_db}}" % login_db_token + print(login_args) + shell = "{} {}=\"{}\" ".format(login_args, query_token, self.current_job.args) return module, shell if module == 'win_shell':