From bff47cbac3af49e6001258e2fbd3e598aa990ca2 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Tue, 19 Mar 2024 13:23:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96dataset=20exec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/bi/views.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/apps/bi/views.py b/apps/bi/views.py index 47e0cbd1..39bb4665 100644 --- a/apps/bi/views.py +++ b/apps/bi/views.py @@ -72,22 +72,14 @@ class DatasetViewSet(CustomModelViewSet): can_cache = True query = dt.default_param if dt.sql_query: - query.update(xquery) + if is_test: + query.update(dt.test_param) + else: + query.update(xquery) try: - if dt.default_param: - query.update(dt.default_param) sql_f_ = check_sql_safe(dt.sql_query.format(**query)) except KeyError as e: - if is_test and dt.test_param: - new_query = dt.test_param - new_query.update(query) - try: - sql_f_ = check_sql_safe( - dt.sql_query.format(**new_query)) - except KeyError: - raise ParseError('需指定查询参数') - else: - raise ParseError(f'需指定查询参数_{str(e)}') + raise ParseError(f'需指定查询参数_{str(e)}') sql_f_strip = sql_f_.strip(';') sql_f_l = sql_f_strip.split(';') hash_k = hash(sql_f_strip)