Merge pull request #94 from daimiaopeng/master

修复查询数据库中结果不能编码到UTF-8的问题
2025-02-23 03:22:17 +08:00 · 2023-12-07 18:58:06 +08:00 · 2023-12-07 18:58:06 +08:00 · a5187345fd
commit a5187345fd
parent 2efc52840a 050920d2c0
1 changed files with 1 additions and 1 deletions
--- a/app/DataBase/merge.py
+++ b/app/DataBase/merge.py
@ -13,7 +13,7 @@ def merge_databases(source_paths, target_path):
            if not os.path.exists(source_path):
                break
            db = sqlite3.connect(source_path)
-            # db.text_factory = bytes
+            db.text_factory = str 
            cursor = db.cursor()
            sql = '''
            SELECT TalkerId,MsgsvrID,Type,SubType,IsSender,CreateTime,Sequence,StrTalker,StrContent,DisplayContent,BytesExtra