reydb 1.1.41__py3-none-any.whl → 1.1.43__py3-none-any.whl

reydb/rconfig.py

@@ -37,7 +37,7 @@ ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 class DatabaseConfig(object):
     """
     Database config type.
-    Can create database used `self.build` method.
+    Can create database used `self.build_db` method.
 
     Examples
     --------
@@ -128,6 +128,20 @@ class DatabaseConfig(object):
                     }
                 ],
                 'primary': 'key',
+                'indexes': [
+                    {
+                        'name': 'n_create_time',
+                        'fields': 'create_time',
+                        'type': 'noraml',
+                        'comment': 'Config create time normal index.'
+                    },
+                    {
+                        'name': 'n_update_time',
+                        'fields': 'update_time',
+                        'type': 'noraml',
+                        'comment': 'Config update time normal index.'
+                    }
+                ],
                 'comment': 'Config data table.'
             }
 

reydb/rdb.py

@@ -10,7 +10,7 @@
 
 
 from typing import Any, Literal, overload
-from collections.abc import Iterable, Generator
+from collections.abc import Iterable, Generator, Container
 from enum import EnumType
 from urllib.parse import quote as urllib_quote
 from pymysql.constants.CLIENT import MULTI_STATEMENTS
@@ -793,7 +793,7 @@ class Database(DatabaseBase):
         self,
         path: str | tuple[str, str],
         data: TableData,
-        duplicate: Literal['ignore', 'update'] | None = None,
+        duplicate: Literal['ignore', 'update'] | Container[str] | None = None,
         report: bool | None = None,
         **kwdata: Any
     ) -> Result:
@@ -808,8 +808,9 @@ class Database(DatabaseBase):
         data : Insert data.
         duplicate : Handle method when constraint error.
             - `None`: Not handled.
-            - `ignore`, Use `UPDATE IGNORE INTO`: clause.
-            - `update`, Use `ON DUPLICATE KEY UPDATE`: clause.
+            - `ignore`: Use `UPDATE IGNORE INTO` clause.
+            - `update`: Use `ON DUPLICATE KEY UPDATE` clause and update all fields.
+            - `Container[str]`: Use `ON DUPLICATE KEY UPDATE` clause and update this fields.
         report : Whether report SQL execute information.
             - `None`, Use attribute `report_execute_info`: of object `ROption`.
             - `int`: Use this value.
@@ -901,6 +902,13 @@ class Database(DatabaseBase):
         ## Join sql part.
         match duplicate:
 
+            ### Not handle.
+            case None:
+                sql = (
+                    f'INSERT INTO `{database}`.`{table}`({sql_fields})\n'
+                    f'VALUES({sql_values})'
+                )
+
             ### Ignore.
             case 'ignore':
                 sql = (
@@ -909,8 +917,20 @@ class Database(DatabaseBase):
                 )
 
             ### Update.
-            case 'update':
-                update_content = ',\n    '.join([f'`{field}` = VALUES(`{field}`)' for field in sql_fields_list])
+            case _:
+                sql_fields_list_update = sql_fields_list
+                if duplicate != 'update':
+                    sql_fields_list_update = [
+                        field
+                        for field in sql_fields_list
+                        if field in duplicate
+                    ]
+                update_content = ',\n    '.join(
+                    [
+                        f'`{field}` = VALUES(`{field}`)'
+                        for field in sql_fields_list_update
+                    ]
+                )
                 sql = (
                     f'INSERT INTO `{database}`.`{table}`({sql_fields})\n'
                     f'VALUES({sql_values})\n'
@@ -918,13 +938,6 @@ class Database(DatabaseBase):
                     f'    {update_content}'
                 )
 
-            ### Not handle.
-            case _:
-                sql = (
-                    f'INSERT INTO `{database}`.`{table}`({sql_fields})\n'
-                    f'VALUES({sql_values})'
-                )
-
         # Execute SQL.
         result = self.execute(sql, data, report, **kwdata_replace)
 

reydb/rerror.py

@@ -28,7 +28,7 @@ __all__ = (
 class DatabaseError(DatabaseBase):
     """
     Database error type.
-    Can create database used `self.build` method.
+    Can create database used `self.build_db` method.
     """
 
 
@@ -114,6 +114,12 @@ class DatabaseError(DatabaseBase):
                 ],
                 'primary': 'id',
                 'indexes': [
+                    {
+                        'name': 'n_create_time',
+                        'fields': 'create_time',
+                        'type': 'noraml',
+                        'comment': 'Record create time normal index.'
+                    },
                     {
                         'name': 'n_type',
                         'fields': 'type',

reydb/rfile.py

@@ -30,7 +30,7 @@ FileInfo = TypedDict('FileInfo', {'create_time': datetime, 'md5': str, 'name': s
 class DatabaseFile(DatabaseBase):
     """
     Database file type.
-    Can create database used `self.build` method.
+    Can create database used `self.build_db` method.
     """
 
 
@@ -113,6 +113,12 @@ class DatabaseFile(DatabaseBase):
                 ],
                 'primary': 'file_id',
                 'indexes': [
+                    {
+                        'name': 'n_create_time',
+                        'fields': 'create_time',
+                        'type': 'noraml',
+                        'comment': 'Record create time normal index.'
+                    },
                     {
                         'name': 'n_md5',
                         'fields': 'md5',

{reydb-1.1.41.dist-info → reydb-1.1.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.1.41
+Version: 1.1.43
 Summary: Database method set.
 Project-URL: homepage, https://github.com/reyxbo/reydb/
 Author-email: Rey <reyxbo@163.com>

{reydb-1.1.41.dist-info → reydb-1.1.43.dist-info}/RECORD

@@ -2,15 +2,15 @@ reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
 reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
 reydb/rbase.py,sha256=HYoFasGBAhXUUHNFP1doGnHBW3-xkgRc32O9KppGSak,4824
 reydb/rbuild.py,sha256=iXJ76BNlUflJfMAAEbPuQLyVePyye8aDq7MaXD16Ktw,32419
-reydb/rconfig.py,sha256=1uQG-khhkupKgzC51nYku3P__-qdaSXZB13GdDyKy00,12312
+reydb/rconfig.py,sha256=akY9zDQ7chmA5Hkf7Q7F_Oqqjn6gDk9B88dyLQEYMak,12886
 reydb/rconn.py,sha256=YWscFMjBph9ttPXjzTTpaziTd7v7vnE0b7E4mVpJ6oc,6163
-reydb/rdb.py,sha256=oDGETlNQqXe2_YzSuX4WE1xhiIlVCGidLevj0fi5GXY,54229
-reydb/rerror.py,sha256=lirCR6yv1-9JsC6ZIKCkS0ezcNojAOAbJpup2xtsyx0,9968
+reydb/rdb.py,sha256=3Kr8U6YoxExfUhiaSXUzvfwhOyAdcNZJYicr0Bb8zX4,54791
+reydb/rerror.py,sha256=cyY-jX6hWi1Ozp3Op0MhprrGBNNIy_nqupaNnHOhBmQ,10232
 reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
-reydb/rfile.py,sha256=JoXI_YgR5TDR7kh06eU0TngEOkSW8DmcZ4SDjTl22Wk,15255
+reydb/rfile.py,sha256=kFKcExyU8PjWRTr6j7ZPB4qJqFMdYNDB77Nkpw4vHcE,15519
 reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
 reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
-reydb-1.1.41.dist-info/METADATA,sha256=sDxvROWfJSEVtOt1ktDArlAxj8J8-RsLy2G53y-laLQ,1550
-reydb-1.1.41.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.41.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.41.dist-info/RECORD,,
+reydb-1.1.43.dist-info/METADATA,sha256=a467RImwupOg5cu_SD9ozAi3MCa__svKbH-wAzoAXVY,1550
+reydb-1.1.43.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.43.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.43.dist-info/RECORD,,