reydb 1.1.40__py3-none-any.whl → 1.1.42__py3-none-any.whl

reydb/rbase.py

@@ -23,8 +23,8 @@ __all__ = (
 )
 
 
-URLParameter = TypedDict(
-    'URLParameter',
+URLParameters = TypedDict(
+    'URLParameters',
     {
         'drivername': str,
         'backend': str,
@@ -45,7 +45,7 @@ class DatabaseBase(Base):
     """
 
 
-def extract_url(url: str | URL) -> URLParameter:
+def extract_url(url: str | URL) -> URLParameters:
     """
     Extract parameters from URL of string.
 

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)
 
@@ -1741,7 +1754,7 @@ class Database(DatabaseBase):
     @property
     def status(self):
         """
-        Build `DatabaseParameterStatus` or `DatabaseParameterPragma` instance.
+        Build `DatabaseParametersStatus` or `DatabaseParametersPragma` instance.
 
         Returns
         -------
@@ -1749,17 +1762,17 @@ class Database(DatabaseBase):
         """
 
         # Import.
-        from .rparam import DatabaseParameterStatus, DatabaseParameterPragma
+        from .rparam import DatabaseParametersStatus, DatabaseParametersPragma
 
         # Build.
 
         ## SQLite.
         if self.backend == 'sqlite':
-            dbp = DatabaseParameterPragma(self)
+            dbp = DatabaseParametersPragma(self)
 
         ## Other.
         else:
-            dbp = DatabaseParameterStatus(self, False)
+            dbp = DatabaseParametersStatus(self, False)
 
         return dbp
 
@@ -1767,7 +1780,7 @@ class Database(DatabaseBase):
     @property
     def global_status(self):
         """
-        Build `DatabaseParameterStatus` or `DatabaseParameterPragma` instance.
+        Build `DatabaseParametersStatus` or `DatabaseParametersPragma` instance.
 
         Returns
         -------
@@ -1775,17 +1788,17 @@ class Database(DatabaseBase):
         """
 
         # Import.
-        from .rparam import DatabaseParameterStatus, DatabaseParameterPragma
+        from .rparam import DatabaseParametersStatus, DatabaseParametersPragma
 
         # Build.
 
         ## SQLite.
         if self.backend == 'sqlite':
-            dbp = DatabaseParameterPragma(self)
+            dbp = DatabaseParametersPragma(self)
 
         ## Other.
         else:
-            dbp = DatabaseParameterStatus(self, True)
+            dbp = DatabaseParametersStatus(self, True)
 
         return dbp
 
@@ -1793,7 +1806,7 @@ class Database(DatabaseBase):
     @property
     def variables(self):
         """
-        Build `DatabaseParameterVariable` or `DatabaseParameterPragma` instance.
+        Build `DatabaseParametersVariable` or `DatabaseParametersPragma` instance.
 
         Returns
         -------
@@ -1801,17 +1814,17 @@ class Database(DatabaseBase):
         """
 
         # Import.
-        from .rparam import DatabaseParameterVariable, DatabaseParameterPragma
+        from .rparam import DatabaseParametersVariable, DatabaseParametersPragma
 
         # Build.
 
         ## SQLite.
         if self.backend == 'sqlite':
-            dbp = DatabaseParameterPragma(self)
+            dbp = DatabaseParametersPragma(self)
 
         ## Other.
         else:
-            dbp = DatabaseParameterVariable(self, False)
+            dbp = DatabaseParametersVariable(self, False)
 
         return dbp
 
@@ -1827,17 +1840,17 @@ class Database(DatabaseBase):
         """
 
         # Import.
-        from .rparam import DatabaseParameterVariable, DatabaseParameterPragma
+        from .rparam import DatabaseParametersVariable, DatabaseParametersPragma
 
         # Build.
 
         ## SQLite.
         if self.backend == 'sqlite':
-            dbp = DatabaseParameterPragma(self)
+            dbp = DatabaseParametersPragma(self)
 
         ## Other.
         else:
-            dbp = DatabaseParameterVariable(self, True)
+            dbp = DatabaseParametersVariable(self, True)
 
         return dbp
 

reydb/rparam.py

@@ -17,16 +17,16 @@ from .rdb import Database
 
 
 __all__ = (
-    'DatabaseParameter',
-    'DatabaseParameterStatus',
-    'DatabaseParameterVariable',
-    'DatabaseParameterPragma'
+    'DatabaseParameters',
+    'DatabaseParametersStatus',
+    'DatabaseParametersVariable',
+    'DatabaseParametersPragma'
 )
 
 
-class DatabaseParameter(DatabaseBase):
+class DatabaseParameters(DatabaseBase):
     """
-    Database parameter type.
+    Database parameters type.
     """
 
 
@@ -85,9 +85,9 @@ class DatabaseParameter(DatabaseBase):
         self.update(params)
 
 
-class DatabaseParameterStatus(DatabaseParameter):
+class DatabaseParametersStatus(DatabaseParameters):
     """
-    Database parameter status type.
+    Database parameters status type.
     """
 
 
@@ -155,9 +155,9 @@ class DatabaseParameterStatus(DatabaseParameter):
         raise AssertionError('database status not update')
 
 
-class DatabaseParameterVariable(DatabaseParameter):
+class DatabaseParametersVariable(DatabaseParameters):
     """
-    Database parameter variable type.
+    Database parameters variable type.
     """
 
 
@@ -247,9 +247,9 @@ class DatabaseParameterVariable(DatabaseParameter):
         self.rdatabase.execute(sql)
 
 
-class DatabaseParameterPragma(DatabaseParameter):
+class DatabaseParametersPragma(DatabaseParameters):
     """
-    Database parameter pragma type.
+    Database parameters pragma type.
     """
 
 

{reydb-1.1.40.dist-info → reydb-1.1.42.dist-info}/METADATA

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

{reydb-1.1.40.dist-info → reydb-1.1.42.dist-info}/RECORD

@@ -1,16 +1,16 @@
 reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
 reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
-reydb/rbase.py,sha256=2mP7vSpJHLt-wFkL8tpehYMMIfysyh1Ktg0cR9fjnJk,4821
+reydb/rbase.py,sha256=HYoFasGBAhXUUHNFP1doGnHBW3-xkgRc32O9KppGSak,4824
 reydb/rbuild.py,sha256=iXJ76BNlUflJfMAAEbPuQLyVePyye8aDq7MaXD16Ktw,32419
 reydb/rconfig.py,sha256=1uQG-khhkupKgzC51nYku3P__-qdaSXZB13GdDyKy00,12312
 reydb/rconn.py,sha256=YWscFMjBph9ttPXjzTTpaziTd7v7vnE0b7E4mVpJ6oc,6163
-reydb/rdb.py,sha256=cSh5qVRhkQQVAuYemYOD0MGtJtYIIBGhrjapeiy6sFE,54207
+reydb/rdb.py,sha256=3Kr8U6YoxExfUhiaSXUzvfwhOyAdcNZJYicr0Bb8zX4,54791
 reydb/rerror.py,sha256=lirCR6yv1-9JsC6ZIKCkS0ezcNojAOAbJpup2xtsyx0,9968
 reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
 reydb/rfile.py,sha256=JoXI_YgR5TDR7kh06eU0TngEOkSW8DmcZ4SDjTl22Wk,15255
 reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
-reydb/rparam.py,sha256=VTHBW4gnBjLtITrv73Rtb1Ppw3UJu_LXeKy2tJuGIBE,7016
-reydb-1.1.40.dist-info/METADATA,sha256=xQvsJCsasRZEuXV4Aa9eS6IBGKgbXw38vVazAUpcZ0w,1550
-reydb-1.1.40.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.40.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.40.dist-info/RECORD,,
+reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
+reydb-1.1.42.dist-info/METADATA,sha256=uAVh_Vj1Vs3U2P022pBnZRvrwzPzxAyu0X_ULJOEKA0,1550
+reydb-1.1.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.42.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.42.dist-info/RECORD,,