对Redis的返回结果进行类型判断，如果是dict,list转为json字符串 (#2690)

Co-authored-by: 王飞 <[email protected]>

Author: feiazifeiazi

sql/engines/redis.py

@@ -6,6 +6,7 @@
 @time: 2019/03/26
 """
 
+import json
 import re
 import shlex
 
@@ -119,6 +120,7 @@ def query_check(self, db_name=None, sql="", limit_num=0):
             "zcard",
             "zcount",
             "zrank",
+            "info",
         ]
         # 命令校验，仅可以执行safe_cmd内的命令
         for cmd in safe_cmd:
@@ -147,7 +149,19 @@ def query(self, db_name=None, sql="", limit_num=0, close_conn=True, **kwargs):
                     result_set.affected_rows = len(rows)
             elif isinstance(rows, dict):
                 result_set.column_list = ["field", "value"]
-                result_set.rows = tuple([[k, v] for k, v in rows.items()])
+                # 对Redis的返回结果进行类型判断，如果是dict,list转为json字符串。
+                pairs_list = []
+                for k, v in rows.items():
+                    if isinstance(v, dict):
+                        processed_value = json.dumps(v)
+                    elif isinstance(v, list):
+                        processed_value = json.dumps(v)
+                    else:
+                        processed_value = v
+                    # 添加处理后的键值对到列表
+                    pairs_list.append([k, processed_value])
+                # 将列表转换为元组并赋值给 result_set.rows
+                result_set.rows = tuple(pairs_list)
                 result_set.affected_rows = len(result_set.rows)
             else:
                 result_set.rows = tuple([[rows]])

sql/engines/tests.py

@@ -298,6 +298,29 @@ def test_query_execute(self, _execute_command):
         self.assertIsInstance(query_result, ResultSet)
         self.assertTupleEqual(query_result.rows, (["text"],))
 
+    @patch("redis.Redis.execute_command")
+    def test_query_with_dict_response(self, _execute_command):
+        # 定义 execute_command 的字典响应
+        dict_response = {
+            "key1": "value1",
+            "key2": {"subkey": "subvalue"},
+            "key3": ["listitem1", "listitem2"],
+        }
+        _execute_command.return_value = dict_response
+        new_engine = RedisEngine(instance=self.ins)
+        query_result = new_engine.query(db_name=0, sql="keys *", limit_num=100)
+
+        # 验证结果集
+        expected_rows = [
+            ["key1", "value1"],
+            ["key2", json.dumps({"subkey": "subvalue"})],
+            ["key3", json.dumps(["listitem1", "listitem2"])],
+        ]
+        self.assertIsInstance(query_result, ResultSet)
+        self.assertEqual(query_result.column_list, ["field", "value"])
+        self.assertEqual(query_result.rows, tuple(expected_rows))
+        self.assertEqual(query_result.affected_rows, len(expected_rows))
+
     @patch("redis.Redis.config_get", return_value={"databases": 4})
     def test_get_all_databases(self, _config_get):
         new_engine = RedisEngine(instance=self.ins)