reywechat 1.0.36__py3-none-any.whl → 1.0.38__py3-none-any.whl

reywechat/rdb.py

@@ -395,7 +395,7 @@ class WeChatDatabase(BaseWeChat):
                         'comment': (
                             'Send type, '
                             '0 is text message, '
-                            "1 is text message with '@', "
+                            "1 is text message with \\'@\\', "
                             '2 is file message, '
                             '3 is image message, '
                             '4 is emoticon message, '
@@ -440,6 +440,7 @@ class WeChatDatabase(BaseWeChat):
                 ],
                 'comment': 'Message send table.'
             }
+
         ]
 
         ## View stats.
@@ -453,7 +454,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_receive',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`message_receive`'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.message_receive']}`'
                         ),
                         'comment': 'Message receive count.'
                     },
@@ -461,7 +462,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_send',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`message_send`\n'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.message_send']}`\n'
                             'WHERE `status` = 2'
                         ),
                         'comment': 'Message send count.'
@@ -470,7 +471,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_user',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`contact_user`'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_user']}`'
                         ),
                         'comment': 'Contact user count.'
                     },
@@ -478,7 +479,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_room',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`contact_room`'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room']}`'
                         ),
                         'comment': 'Contact room count.'
                     },
@@ -486,7 +487,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'count_room_user',
                         'select': (
                             'SELECT COUNT(1)\n'
-                            'FROM `wechat`.`contact_room_user`'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room_user']}`'
                         ),
                         'comment': 'Contact room user count.'
                     },
@@ -494,7 +495,7 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'last_time_receive',
                         'select': (
                             'SELECT MAX(`message_time`)\n'
-                            'FROM `wechat`.`message_receive`'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.message_receive']}`'
                         ),
                         'comment': 'Message last receive time.'
                     },
@@ -502,13 +503,14 @@ class WeChatDatabase(BaseWeChat):
                         'name': 'last_time_send',
                         'select': (
                             'SELECT MAX(`status_time`)\n'
-                            'FROM `wechat`.`message_send`\n'
+                            f'FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.message_send']}`\n'
                             'WHERE `status` = 2'
                         ),
                         'comment': 'Message last send time.'
                     }
                 ]
             }
+
         ]
 
         # Build.
@@ -560,12 +562,12 @@ class WeChatDatabase(BaseWeChat):
         ## Update.
         if user_ids == []:
             sql = (
-                'UPDATE `wechat`.`contact_user`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_user']}`\n'
                 'SET `contact` = 0'
             )
         else:
             sql = (
-                'UPDATE `wechat`.`contact_user`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_user']}`\n'
                 'SET `contact` = 0\n'
                 'WHERE `user_id` NOT IN :user_ids'
             )
@@ -616,12 +618,12 @@ class WeChatDatabase(BaseWeChat):
         ## Update.
         if room_ids == []:
             sql = (
-                'UPDATE `wechat`.`contact_room`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room']}`\n'
                 'SET `contact` = 0'
             )
         else:
             sql = (
-                'UPDATE `wechat`.`contact_room`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room']}`\n'
                 'SET `contact` = 0\n'
                 'WHERE `room_id` NOT IN :room_ids'
             )
@@ -694,18 +696,18 @@ class WeChatDatabase(BaseWeChat):
         ## Update.
         if room_user_ids == []:
             sql = (
-                'UPDATE `wechat`.`contact_room_user`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room_user']}`\n'
                 'SET `contact` = 0'
             )
         elif room_id is None:
             sql = (
-                'UPDATE `wechat`.`contact_room_user`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room_user']}`\n'
                 'SET `contact` = 0\n'
                 "WHERE CONCAT(`room_id`, ',', `user_id`) NOT IN :room_user_ids"
             )
         else:
             sql = (
-                'UPDATE `wechat`.`contact_room_user`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room_user']}`\n'
                 'SET `contact` = 0\n'
                 'WHERE (\n'
                 '    `room_id` = :room_id\n'
@@ -1043,7 +1045,7 @@ class WeChatDatabase(BaseWeChat):
                 for row in table
             ]
             sql = (
-                'UPDATE `wechat`.`message_send`\n'
+                f'UPDATE `{self.path_names['wechat']}`.`{self.path_names['wechat.message_send']}`\n'
                 'SET `status` = 1\n'
                 'WHERE `send_id` IN :send_ids'
             )
@@ -1122,13 +1124,13 @@ class WeChatDatabase(BaseWeChat):
             sql = (
             'SELECT (\n'
             '    SELECT `valid`\n'
-            '    FROM `wechat`.`contact_room_user`\n'
+            f'    FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room_user']}`\n'
             '    WHERE `room_id` = :room_id AND `user_id` = :user_id\n'
             '    LIMIT 1\n'
             ') AS `valid`\n'
             'FROM (\n'
             '    SELECT `valid`\n'
-            '    FROM `wechat`.`contact_room`\n'
+            f'    FROM `{self.path_names['wechat']}`.`{self.path_names['wechat.contact_room']}`\n'
             '    WHERE `room_id` = :room_id\n'
             '    LIMIT 1\n'
             ') AS `a`\n'

{reywechat-1.0.36.dist-info → reywechat-1.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reywechat
-Version: 1.0.36
+Version: 1.0.38
 Summary: WeChat method set.
 Project-URL: homepage, https://github.com/reyxbo/reywechat/
 Author-email: Rey <reyxbo@163.com>

{reywechat-1.0.36.dist-info → reywechat-1.0.38.dist-info}/RECORD

@@ -3,7 +3,7 @@ reywechat/rall.py,sha256=zEW-mLL2uP8aT2_foCMFGmMi_3RCrGl8qutnSVkmY1E,397
 reywechat/rbase.py,sha256=0NunIUIXra2ML2N6odwMk5oENTE0r6VSBHWXUvgI-lc,1124
 reywechat/rcache.py,sha256=Hh_HE-t_KUMlrz4gEFPh1AjmhnrSgH520IFJPumWb7A,908
 reywechat/rclient.py,sha256=MEvQB3pHb5ORukKbKntalRtFcKIOP9BGtDsMt5ihQfM,22524
-reywechat/rdb.py,sha256=JsBBZmASZd0rYqI0kwMmscTDlan2Z0T2aZlLycybQTs,41480
+reywechat/rdb.py,sha256=i4YvgKPU9Z5M7N6-X8L93A8qa24FyFS-YkNLcGAC6Y8,42338
 reywechat/rlog.py,sha256=x4WFLNoeKqGjPVoI81ZZNEd9ctdYToSg5hEFuESmCQY,5254
 reywechat/rreceive.py,sha256=RkUwPsWz6k_Ua3ovrbXRMVajeNOJQqvpPXz_CvJyUPQ,35162
 reywechat/rschedule.py,sha256=bZEEZV3K4zrJvupe1Eq6kGR7kunbVq5dfGnqFKYF3JI,1857
@@ -11,7 +11,7 @@ reywechat/rsend.py,sha256=UmdKCOb1cPKEmBPHt9htjxB8fPyi5jW5pGwpRQIZdKA,13720
 reywechat/rtrigger.py,sha256=n8kUNovh62r7crlXrp33uaKvbILT-wcfvUqeyGt7YhM,4956
 reywechat/rwechat.py,sha256=Iir9EC0E3TmLElPf6k_Tkc7lZOr4uO1X9bpOZ0t0EV0,4884
 reywechat/data/client_api.dll,sha256=H9uj-x9Ztg0jFZK0yY6NsnyH5_119dQRFfoVVMidxRs,592384
-reywechat-1.0.36.dist-info/METADATA,sha256=9Wn2n48CxZ2OSV1l_HUs3PcziqDtAyMJXdp1b-7_DHY,1551
-reywechat-1.0.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reywechat-1.0.36.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reywechat-1.0.36.dist-info/RECORD,,
+reywechat-1.0.38.dist-info/METADATA,sha256=pLvQOMbIjktqYHZNIxl6hpvffAbFvcfqXMHheIJgWQI,1551
+reywechat-1.0.38.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reywechat-1.0.38.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reywechat-1.0.38.dist-info/RECORD,,