Revert "engine增加escape_string用于处理字符串参数转义 (#2107)"

This reverts commit e2573b7.

sql/data_dictionary.py

@@ -29,7 +29,6 @@ def table_list(request):
                 instance_name=instance_name, db_type=db_type
             )
             query_engine = get_engine(instance=instance)
-            db_name = query_engine.escape_string(db_name)
             data = query_engine.get_group_tables_by_db(db_name=db_name)
             res = {"status": 0, "data": data}
         except Instance.DoesNotExist:
@@ -51,16 +50,13 @@ def table_info(request):
     db_name = request.GET.get("db_name", "")
     tb_name = request.GET.get("tb_name", "")
     db_type = request.GET.get("db_type", "")
-
     if instance_name and db_name and tb_name:
         data = {}
         try:
             instance = Instance.objects.get(
                 instance_name=instance_name, db_type=db_type
             )
             query_engine = get_engine(instance=instance)
-            db_name = query_engine.escape_string(db_name)
-            tb_name = query_engine.escape_string(tb_name)
             data["meta_data"] = query_engine.get_table_meta_data(
                 db_name=db_name, tb_name=tb_name
             )
@@ -95,6 +91,8 @@ def export(request):
     """导出数据字典"""
     instance_name = request.GET.get("instance_name", "")
     db_name = request.GET.get("db_name", "")
+    # escape
+    db_name = MySQLdb.escape_string(db_name).decode("utf-8")
 
     try:
         instance = user_instances(
@@ -106,7 +104,7 @@ def export(request):
 
     # 普通用户仅可以获取指定数据库的字典信息
     if db_name:
-        dbs = [query_engine.escape_string(db_name)]
+        dbs = [db_name]
     # 管理员可以导出整个实例的字典信息
     elif request.user.is_superuser:
         dbs = query_engine.get_all_databases().rows

sql/engines/__init__.py

@@ -86,10 +86,6 @@ def info(self):
         """返回引擎简介"""
         return "Base engine"
 
-    def escape_string(self, value: str) -> str:
-        """参数转义"""
-        return value
-
     @property
     def auto_backup(self):
         """是否支持备份"""

sql/engines/clickhouse.py

@@ -1,6 +1,5 @@
 # -*- coding: UTF-8 -*-
 from clickhouse_driver import connect
-from clickhouse_driver.util.escape import escape_chars_map
 from sql.utils.sql_utils import get_syntax_type
 from .models import ResultSet, ReviewResult, ReviewSet
 from common.utils.timer import FuncTimer
@@ -50,10 +49,6 @@ def name(self):
     def info(self):
         return "ClickHouse engine"
 
-    def escape_string(self, value: str) -> str:
-        """字符串参数转义"""
-        return "'%s'" % "".join(escape_chars_map.get(c, c) for c in value)
-
     @property
     def auto_backup(self):
         """是否支持备份"""

sql/engines/mysql.py

@@ -98,10 +98,6 @@ def name(self):
     def info(self):
         return "MySQL engine"
 
-    def escape_string(self, value: str) -> str:
-        """字符串参数转义"""
-        return MySQLdb.escape_string(value).decode("utf-8")
-
     @property
     def auto_backup(self):
         """是否支持备份"""
@@ -171,7 +167,7 @@ def get_all_tables(self, db_name, **kwargs):
 
     def get_group_tables_by_db(self, db_name):
         # escape
-        db_name = self.escape_string(db_name)
+        db_name = MySQLdb.escape_string(db_name).decode("utf-8")
         data = {}
         sql = f"""SELECT TABLE_NAME,
                             TABLE_COMMENT
@@ -190,8 +186,8 @@ def get_group_tables_by_db(self, db_name):
     def get_table_meta_data(self, db_name, tb_name, **kwargs):
         """数据字典页面使用：获取表格的元信息，返回一个dict{column_list: [], rows: []}"""
         # escape
-        db_name = self.escape_string(db_name)
-        tb_name = self.escape_string(tb_name)
+        db_name = MySQLdb.escape_string(db_name).decode("utf-8")
+        tb_name = MySQLdb.escape_string(tb_name).decode("utf-8")
         sql = f"""SELECT
                         TABLE_NAME as table_name,
                         ENGINE as engine,

sql/instance.py

@@ -163,9 +163,6 @@ def param_edit(request):
     instance_id = request.POST.get("instance_id")
     variable_name = request.POST.get("variable_name")
     variable_value = request.POST.get("runtime_value")
-    # escape
-    variable_name = MySQLdb.escape_string(variable_name).decode("utf-8")
-    variable_value = MySQLdb.escape_string(variable_value).decode("utf-8")
 
     try:
         ins = Instance.objects.get(id=instance_id)
@@ -323,10 +320,12 @@ def instance_resource(request):
     result = {"status": 0, "msg": "ok", "data": []}
 
     try:
+        # escape
+        db_name = MySQLdb.escape_string(db_name).decode("utf-8")
+        schema_name = MySQLdb.escape_string(schema_name).decode("utf-8")
+        tb_name = MySQLdb.escape_string(tb_name).decode("utf-8")
+
         query_engine = get_engine(instance=instance)
-        db_name = query_engine.escape_string(db_name)
-        schema_name = query_engine.escape_string(schema_name)
-        tb_name = query_engine.escape_string(tb_name)
         if resource_type == "database":
             resource = query_engine.get_all_databases()
         elif resource_type == "schema" and db_name:
@@ -364,14 +363,10 @@ def describe(request):
     db_name = request.POST.get("db_name")
     schema_name = request.POST.get("schema_name")
     tb_name = request.POST.get("tb_name")
-
     result = {"status": 0, "msg": "ok", "data": []}
 
     try:
         query_engine = get_engine(instance=instance)
-        db_name = query_engine.escape_string(db_name)
-        schema_name = query_engine.escape_string(schema_name)
-        tb_name = query_engine.escape_string(tb_name)
         query_result = query_engine.describe_table(
             db_name, tb_name, schema_name=schema_name
         )

sql/instance_database.py

@@ -111,8 +111,10 @@ def create(request):
     except Users.DoesNotExist:
         return JsonResponse({"status": 1, "msg": "负责人不存在", "data": []})
 
+    # escape
+    db_name = MySQLdb.escape_string(db_name).decode("utf-8")
+
     engine = get_engine(instance=instance)
-    db_name = engine.escape_string(db_name)
     exec_result = engine.execute(
         db_name="information_schema", sql=f"create database {db_name};"
     )

sql/sql_optimize.py

@@ -163,6 +163,8 @@ def optimize_sqltuning(request):
     except Instance.DoesNotExist:
         result = {"status": 1, "msg": "你所在组未关联该实例！", "data": []}
         return HttpResponse(json.dumps(result), content_type="application/json")
+    # escape
+    db_name = MySQLdb.escape_string(db_name).decode("utf-8")
 
     sql_tunning = SqlTuning(
         instance_name=instance_name, db_name=db_name, sqltext=sqltext
@@ -233,7 +235,6 @@ def explain(request):
 
     # 执行获取执行计划语句
     query_engine = get_engine(instance=instance)
-    db_name = query_engine.escape_string(db_name)
     sql_result = query_engine.query(str(db_name), sql_content).to_sep_dict()
     result["data"] = sql_result
 
@@ -286,7 +287,6 @@ def optimize_sqltuningadvisor(request):
 
     # 执行获取优化报告
     query_engine = get_engine(instance=instance)
-    db_name = query_engine.escape_string(db_name)
     sql_result = query_engine.sqltuningadvisor(str(db_name), sql_content).to_sep_dict()
     result["data"] = sql_result
 

sql/sql_tuning.py

@@ -13,7 +13,7 @@ def __init__(self, instance_name, db_name, sqltext):
         instance = Instance.objects.get(instance_name=instance_name)
         query_engine = get_engine(instance=instance)
         self.engine = query_engine
-        self.db_name = self.engine.escape_string(db_name)
+        self.db_name = db_name
         self.sqltext = sqltext
         self.sql_variable = """
     select

sql/tests.py

@@ -2539,7 +2539,7 @@ def test_param_edit_variable_not_config(
         data = {
             "instance_id": self.master.id,
             "variable_name": "1",
-            "runtime_value": "false",
+            "variable_value": "false",
         }
         r = self.client.post(path="/param/edit/", data=data)
         self.assertEqual(

sql_api/api_instance.py

@@ -187,10 +187,12 @@ def post(self, request):
         instance = Instance.objects.get(pk=instance_id)
 
         try:
+            # escape
+            db_name = MySQLdb.escape_string(db_name).decode("utf-8")
+            schema_name = MySQLdb.escape_string(schema_name).decode("utf-8")
+            tb_name = MySQLdb.escape_string(tb_name).decode("utf-8")
+
             query_engine = get_engine(instance=instance)
-            db_name = query_engine.escape_string(db_name)
-            schema_name = query_engine.escape_string(schema_name)
-            tb_name = query_engine.escape_string(tb_name)
             if resource_type == "database":
                 resource = query_engine.get_all_databases()
             elif resource_type == "schema" and db_name:

sql_api/api_workflow.py

@@ -1,4 +1,3 @@
-import MySQLdb
 from django.contrib.auth.decorators import permission_required
 from django.utils.decorators import method_decorator
 from rest_framework import views, generics, status, serializers, permissions
@@ -61,11 +60,9 @@ def post(self, request):
         instance = serializer.get_instance()
         # 交给engine进行检测
         try:
-            db_name = request.data["db_name"]
             check_engine = get_engine(instance=instance)
-            db_name = check_engine.escape_string(db_name)
             check_result = check_engine.execute_check(
-                db_name=db_name, sql=request.data["full_sql"].strip()
+                db_name=request.data["db_name"], sql=request.data["full_sql"].strip()
             )
         except Exception as e:
             raise serializers.ValidationError({"errors": f"{e}"})