fix data dictionary test

hhyo · Aug 14, 2023 · 619fd9d · 619fd9d
1 parent 0e59cd1
commit 619fd9d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/downloads/dictionary/test_instance_test_archery.html b/downloads/dictionary/test_instance_test_archery.html
@@ -1,8 +1,8 @@
 <html>
     <meta charset="utf-8">
-    <title>数据库表结构说明文档</title>
+    <title>数据库表结构说明文档</title>
     <style>
-        body,td,th {font-family:"宋体"; font-size:12px;}
+        body,td,th {font-family:"宋体"; font-size:12px;}
         table,h1,p{width:960px;margin:0px auto;}
         table{border-collapse:collapse;border:1px solid #CCC;background:#efefef;}
         table caption{text-align:left; background-color:#fff; line-height:2em; font-size:14px; font-weight:bold; }
@@ -11,8 +11,8 @@
     </style>
 
     <body>
-    <h1 style="text-align:center;">test_archery 数据字典 (共 0 个表)</h1>
-    <p style="text-align:center;margin:20px auto;">生成时间：2023-01-31 14:41:33</p>
+    <h1 style="text-align:center;">test_archery 数据字典 (共 0 个表)</h1>
+    <p style="text-align:center;margin:20px auto;">生成时间：2023-08-14 18:44:43</p>
 
     </body>
 </html>
diff --git a/sql/data_dictionary.py b/sql/data_dictionary.py
@@ -126,12 +126,14 @@ def export(request):
         data = loader.render_to_string(
             template_name="dictionaryexport.html", context=context, request=request
         )
-        with open(f"{path}/{instance_name}_{db}.html", "w") as f:
+        with open(os.path.join(path, f"{instance_name}_{db}.html"), "w") as f:
             f.write(data)
     # 关闭连接
     query_engine.close()
     if db_name:
-        response = FileResponse(open(f"{path}/{instance_name}_{db_name}.html", "rb"))
+        response = FileResponse(
+            open(os.path.join(path, f"{instance_name}_{db_name}.html"), "rb")
+        )
         response["Content-Type"] = "application/octet-stream"
         response[
             "Content-Disposition"

diff --git a/sql/tests.py b/sql/tests.py
@@ -3181,6 +3181,11 @@ def test_export_db(self, _get_engine):
         测试导出
         :return:
         """
+
+        def dummy(s):
+            return s
+
+        _get_engine.return_value.escape_string = dummy
         _get_engine.return_value.get_all_databases.return_value.rows.return_value = (
             ResultSet(rows=(("test1",), ("test2",)))
         )