From 0fa86b8ca6c1373e78506b76950e2a6ad04c30d4 Mon Sep 17 00:00:00 2001
From: Rock Chin <junyan_qin@outlook.com>
Date: Tue, 13 Dec 2022 00:38:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=AD=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=BD=AC=E4=B9=89?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=A0=E6=88=90=E5=A4=9A=E4=B8=AA"/"=20#20?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/database/manager.py | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkg/database/manager.py b/pkg/database/manager.py
index 9b58cdbd..30e508f5 100644
--- a/pkg/database/manager.py
+++ b/pkg/database/manager.py
@@ -2,14 +2,13 @@ import logging
 import time
 from sqlite3 import Cursor
 
-from pymysql.converters import escape_string
-
 import sqlite3
 
 import config
 
 inst = None
 
+
 # 数据库管理
 # 为其他模块提供数据库操作接口
 class DatabaseManager:
@@ -29,9 +28,9 @@ class DatabaseManager:
         # self.conn.isolation_level = None
         self.cursor = self.conn.cursor()
 
-    def execute(self, sql: str) -> Cursor:
-        logging.debug('SQL: {}'.format(sql))
-        c = self.cursor.execute(sql)
+    def execute(self, *args, **kwargs) -> Cursor:
+        # logging.debug('SQL: {}'.format(sql))
+        c = self.cursor.execute(*args, **kwargs)
         self.conn.commit()
         return c
 
@@ -62,17 +61,23 @@ class DatabaseManager:
         """.format(subject_type, subject_number, create_timestamp))
         count = self.cursor.fetchone()[0]
         if count == 0:
-            self.execute("""
+
+            sql = """
             insert into `sessions` (`name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`) 
-            values ('{}', '{}', {}, {}, {}, '{}')
-            """.format("{}_{}".format(subject_type, subject_number), subject_type, subject_number, create_timestamp,
-                       last_interact_timestamp, escape_string(prompt)))
+            values (?, ?, ?, ?, ?, ?)
+            """
+
+            self.execute(sql,
+                         ("{}_{}".format(subject_type, subject_number), subject_type, subject_number, create_timestamp,
+                          last_interact_timestamp, prompt))
         else:
-            self.execute("""
-            update `sessions` set `last_interact_timestamp` = {}, `prompt` = '{}' 
-            where `type` = '{}' and `number` = {} and `create_timestamp` = {}
-            """.format(last_interact_timestamp, escape_string(prompt), subject_type,
-                       subject_number, create_timestamp))
+            sql = """
+            update `sessions` set `last_interact_timestamp` = ?, `prompt` = ? 
+            where `type` = ? and `number` = ? and `create_timestamp` = ?
+            """
+
+            self.execute(sql, (last_interact_timestamp, prompt, subject_type,
+                               subject_number, create_timestamp))
 
     # 显式关闭一个session
     def explicit_close_session(self, session_name: str, create_timestamp: int):