reydb 1.1.59__py3-none-any.whl → 1.1.61__py3-none-any.whl

reydb/rorm.py

@@ -9,11 +9,12 @@
 """
 
 
-from typing import Self, Any, Type, TypeVar, Generic, Final, overload
+from typing import Self, Any, Type, Literal, TypeVar, Generic, Final, overload
 from collections.abc import Callable
 from functools import wraps as functools_wraps
 from inspect import iscoroutinefunction as inspect_iscoroutinefunction
 from pydantic import ConfigDict, field_validator as pydantic_field_validator, model_validator as pydantic_model_validator
+from sqlalchemy import text as sqlalchemy_text
 from sqlalchemy.orm import SessionTransaction
 from sqlalchemy.ext.asyncio import AsyncSessionTransaction
 from sqlalchemy.sql import sqltypes
@@ -29,12 +30,6 @@ from . import rdb
 from .rbase import (
     SessionT,
     SessionTransactionT,
-    DatabaseT,
-    DatabaseORMT,
-    DatabaseORMStatementSelectT,
-    DatabaseORMStatementInsertT,
-    DatabaseORMStatementUpdateT,
-    DatabaseORMStatementDeleteT,
     DatabaseBase
 )
 
@@ -64,9 +59,15 @@ __all__ = (
 )
 
 
+DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 DatabaseORMModelT = TypeVar('DatabaseORMModelT', bound='DatabaseORMModel')
+DatabaseORMT = TypeVar('DatabaseORMT', 'DatabaseORM', 'DatabaseORMAsync')
 DatabaseORMSessionT = TypeVar('DatabaseORMSessionT', 'DatabaseORMSession', 'DatabaseORMSessionAsync')
 DatabaseORMStatementReturn = TypeVar('DatabaseORMStatementReturn')
+DatabaseORMStatementSelectT = TypeVar('DatabaseORMStatementSelectT', 'DatabaseORMStatementSelect', 'DatabaseORMStatementSelectAsync')
+DatabaseORMStatementInsertT = TypeVar('DatabaseORMStatementInsertT', 'DatabaseORMStatementInsert', 'DatabaseORMStatementInsertAsync')
+DatabaseORMStatementUpdateT = TypeVar('DatabaseORMStatementUpdateT', 'DatabaseORMStatementUpdate', 'DatabaseORMStatementUpdateAsync')
+DatabaseORMStatementDeleteT = TypeVar('DatabaseORMStatementDeleteT', 'DatabaseORMStatementDelete', 'DatabaseORMStatementDeleteAsync')
 
 
 class DatabaseORMBase(DatabaseBase):
@@ -100,9 +101,19 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
         """
 
         # Handle parameter.
-        if attrs['__module__'] == '__main__':
+        if '__annotations__' in attrs:
             table_args = attrs.setdefault('__table_args__', {})
             table_args['quote'] = True
+
+            ## Charset.
+            attrs.setdefault('__charset__', 'utf8mb4')
+            table_args['mysql_charset'] = attrs.pop('__charset__')
+
+            ## Name.
+            if '__name__' in attrs:
+                name = attrs.pop('__name__')
+
+            ## Comment.
             if '__comment__' in attrs:
                 table_args['comment'] = attrs.pop('__comment__')
 
@@ -222,7 +233,7 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
         table.comment = comment
 
 
-class DatabaseORMModelField(DatabaseBase, FieldInfo):
+class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
     """
     Database ORM model filed type.
 
@@ -239,12 +250,12 @@ class DatabaseORMModelField(DatabaseBase, FieldInfo):
         arg_default: Any | Callable[[], Any] | Null = Null,
         *,
         arg_name: str | None = None,
-        field_default: str | None = None,
+        field_default: str | Literal['CURRENT_TIMESTAMP'] | Literal['ON UPDATE CURRENT_TIMESTAMP'] | None = None,
         filed_name: str | None = None,
         field_type: TypeEngine | None = None,
         key: bool = False,
         key_auto: bool = False,
-        non_null: bool = False,
+        not_null: bool = False,
         index_n: bool = False,
         index_u: bool = False,
         comment: str | None = None,
@@ -276,13 +287,15 @@ class DatabaseORMModelField(DatabaseBase, FieldInfo):
         arg_name : Call argument name.
             - `None`: Same as attribute name.
         field_default : Database field defualt value.
+            - `Literal['current_timestamp']`: Set SQL syntax 'current_timestamp', case insensitive.
+            - `Literal['on update current_timestamp']`: Set SQL syntax 'on update current_timestamp', case insensitive.
         filed_name : Database field name.
             - `None`: Same as attribute name.
         field_type : Database field type.
             - `None`: Based type annotation automatic judgment.
         key : Whether the field is primary key.
         key_auto : Whether the field is automatic increment primary key.
-        non_null : Whether the field is non null constraint.
+        not_null : Whether the field is not null constraint.
         index_n : Whether the field add normal index.
         index_u : Whether the field add unique index.
         comment : Field commment.
@@ -346,7 +359,11 @@ class DatabaseORMModelField(DatabaseBase, FieldInfo):
 
         ## Field default.
         if 'field_default' in kwargs:
-            kwargs['sa_column_kwargs']['server_default'] = kwargs.pop('field_default')
+            field_default: str = kwargs.pop('field_default')
+            field_default_upper = field_default.upper()
+            if field_default_upper in ('CURRENT_TIMESTAMP', 'ON UPDATE CURRENT_TIMESTAMP'):
+                field_default = sqlalchemy_text(field_default_upper)
+            kwargs['sa_column_kwargs']['server_default'] = field_default
 
         ## Field name.
         if 'filed_name' in kwargs:
@@ -363,8 +380,8 @@ class DatabaseORMModelField(DatabaseBase, FieldInfo):
             kwargs['sa_column_kwargs']['autoincrement'] = False
 
         ## Non null.
-        if 'non_null' in kwargs:
-            kwargs['nullable'] = not kwargs.pop('non_null')
+        if 'not_null' in kwargs:
+            kwargs['nullable'] = not kwargs.pop('not_null')
         else:
             kwargs['nullable'] = True
 
@@ -395,7 +412,7 @@ class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseT, DatabaseORMSessionT])
     Model = DatabaseORMModel
     Field = DatabaseORMModelField
     Config = ConfigDict
-    tyeps = sqltypes
+    types = sqltypes
     wrap_validate_model = pydantic_model_validator
     wrap_validate_filed = pydantic_field_validator
 
@@ -792,12 +809,12 @@ class DatabaseORMSession(
         skip: bool = False
     ) -> None:
         """
-        Create table.
+        Create tables.
 
         Parameters
         ----------
         models : ORM model instances.
-        skip : Skip existing table.
+        skip : Whether skip existing table.
         """
 
         # Handle parameter.
@@ -821,7 +838,7 @@ class DatabaseORMSession(
         skip: bool = False
     ) -> None:
         """
-        Delete table.
+        Delete tables.
 
         Parameters
         ----------
@@ -839,7 +856,7 @@ class DatabaseORMSession(
         if None in tables:
             throw(ValueError, tables)
 
-        # Create.
+        # Drop.
         self.orm.metaData.drop_all(self.orm.db.engine, tables, skip)
 
 
@@ -1158,12 +1175,12 @@ class DatabaseORMSessionAsync(
         skip: bool = False
     ) -> None:
         """
-        Asynchronous create table.
+        Asynchronous create tables.
 
         Parameters
         ----------
         models : ORM model instances.
-        skip : Skip existing table.
+        skip : Whether skip existing table.
         """
 
         # Handle parameter.
@@ -1188,7 +1205,7 @@ class DatabaseORMSessionAsync(
         skip: bool = False
     ) -> None:
         """
-        Asynchronous delete table.
+        Asynchronous delete tables.
 
         Parameters
         ----------
@@ -1206,7 +1223,7 @@ class DatabaseORMSessionAsync(
         if None in tables:
             throw(ValueError, tables)
 
-        # Create.
+        # Drop.
         conn = await self.sess.connection()
         await conn.run_sync(self.orm.metaData.drop_all, tables, skip)
 

reydb/rparam.py

@@ -9,21 +9,34 @@
 """
 
 
-from typing import Generic, overload
+from typing import Literal, TypeVar, Generic, Final, overload
 
 from . import rdb
-from .rbase import DatabaseT, DatabaseBase
+from .rbase import DatabaseBase
 from .rexec import Result
 
 
 __all__ = (
+    'DatabaseSchemaSuper',
     'DatabaseSchema',
+    'DatabaseSchemaAsync',
+    'DatabaseParametersSuper',
     'DatabaseParameters',
+    'DatabaseParametersAsync',
+    'DatabaseParametersVariables',
     'DatabaseParametersStatus',
-    'DatabaseParametersVariable'
+    'DatabaseParametersVariablesGlobal',
+    'DatabaseParametersStatusGlobal',
+    'DatabaseParametersVariablesAsync',
+    'DatabaseParametersStatusAsync',
+    'DatabaseParametersVariablesGlobalAsync',
+    'DatabaseParametersStatusGlobalAsync'
 )
 
 
+DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
+
+
 class DatabaseSchemaSuper(DatabaseBase, Generic[DatabaseT]):
     """
     Database schema super type.
@@ -182,16 +195,18 @@ class DatabaseSchemaAsync(DatabaseSchemaSuper['rdb.DatabaseAsync']):
         return schema_dict
 
 
-class DatabaseParameters(DatabaseBase):
+class DatabaseParametersSuper(DatabaseBase, Generic[DatabaseT]):
     """
-    Database parameters type.
+    Database parameters super type.
     """
 
+    mode: Literal['VARIABLES', 'STATUS']
+    glob: bool
+
 
     def __init__(
         self,
-        db: 'rdb.Database',
-        global_: bool
+        db: DatabaseT
     ) -> None:
         """
         Build instance attributes.
@@ -199,12 +214,16 @@ class DatabaseParameters(DatabaseBase):
         Parameters
         ----------
         db: Database instance.
-        global\\_ : Whether base global.
         """
 
         # Set parameter.
         self.db = db
-        self.global_ = global_
+
+
+class DatabaseParameters(DatabaseParametersSuper['rdb.Database']):
+    """
+    Database parameters type.
+    """
 
 
     def __getitem__(self, key: str) -> str | None:
@@ -243,12 +262,6 @@ class DatabaseParameters(DatabaseBase):
         self.update(params)
 
 
-class DatabaseParametersStatus(DatabaseParameters):
-    """
-    Database parameters status type.
-    """
-
-
     @overload
     def get(self) -> dict[str, str]: ...
 
@@ -271,14 +284,11 @@ class DatabaseParametersStatus(DatabaseParameters):
         """
 
         # Generate SQL.
-
-        ## Global.
-        if self.global_:
-            sql = 'SHOW GLOBAL STATUS'
-
-        ## Not global.
-        else:
-            sql = 'SHOW STATUS'
+        sql = 'SHOW ' + (
+            'GLOBAL '
+            if self.glob
+            else ''
+        ) + self.mode
 
         # Execute SQL.
 
@@ -309,25 +319,80 @@ class DatabaseParametersStatus(DatabaseParameters):
         params : Update parameter key value pairs.
         """
 
-        # Throw exception.
-        raise AssertionError('database status not update')
+        # Generate SQL.
+        sql_set_list = [
+            '%s = %s' % (
+                key,
+                (
+                    value
+                    if type(value) in (int, float)
+                    else "'%s'" % value
+                )
+            )
+            for key, value in params.items()
+        ]
+        sql_set = ',\n    '.join(sql_set_list)
+        sql = 'SHOW ' + (
+            'GLOBAL '
+            if self.glob
+            else ''
+        ) + sql_set
+
+        # Execute SQL.
+        self.db.execute(sql)
 
 
-class DatabaseParametersVariable(DatabaseParameters):
+class DatabaseParametersAsync(DatabaseParametersSuper['rdb.DatabaseAsync']):
     """
-    Database parameters variable type.
+    Asynchrouous database parameters type.
     """
 
 
+    async def __getitem__(self, key: str) -> str | None:
+        """
+        Asynchrouous get item of parameter dictionary.
+
+        Parameters
+        ----------
+        key : Parameter key.
+
+        Returns
+        -------
+        Parameter value.
+        """
+
+        # Get.
+        value = await self.get(key)
+
+        return value
+
+
+    async def __setitem__(self, key: str, value: str | float) -> None:
+        """
+        Asynchrouous set item of parameter dictionary.
+
+        Parameters
+        ----------
+        key : Parameter key.
+        value : Parameter value.
+        """
+
+        # Set.
+        params = {key: value}
+
+        # Update.
+        await self.update(params)
+
+
     @overload
-    def get(self) -> dict[str, str]: ...
+    async def get(self) -> dict[str, str]: ...
 
     @overload
-    def get(self, key: str) -> str | None: ...
+    async def get(self, key: str) -> str | None: ...
 
-    def get(self, key: str | None = None) -> dict[str, str] | str | None:
+    async def get(self, key: str | None = None) -> dict[str, str] | str | None:
         """
-        Get parameter.
+        Asynchrouous get parameter.
 
         Parameters
         ----------
@@ -337,48 +402,49 @@ class DatabaseParametersVariable(DatabaseParameters):
 
         Returns
         -------
-        Variables of database.
+        Status of database.
         """
 
         # Generate SQL.
-
-        ## Global.
-        if self.global_:
-            sql = 'SHOW GLOBAL VARIABLES'
-
-        ## Not global.
-        else:
-            sql = 'SHOW VARIABLES'
+        sql = 'SHOW ' + (
+            'GLOBAL '
+            if self.glob
+            else ''
+        ) + self.mode
 
         # Execute SQL.
 
         ## Dictionary.
         if key is None:
-            result = self.db.execute(sql, key=key)
-            variables = result.to_dict(val_field=1)
+            result = await self.db.execute(sql, key=key)
+            status = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = self.db.execute(sql, key=key)
+            result = await self.db.execute(sql, key=key)
             row = result.first()
             if row is None:
-                variables = None
+                status = None
             else:
-                variables = row['Value']
+                status = row['Value']
 
-        return variables
+        return status
 
 
-    def update(self, params: dict[str, str | float]) -> None:
+    async def update(self, params: dict[str, str | float]) -> None:
         """
-        Update parameter.
+        Asynchrouous update parameter.
 
         Parameters
         ----------
         params : Update parameter key value pairs.
         """
 
+        # Check.
+        if self.mode == 'STATUS':
+            raise AssertionError('database status not update')
+
         # Generate SQL.
         sql_set_list = [
             '%s = %s' % (
@@ -392,14 +458,83 @@ class DatabaseParametersVariable(DatabaseParameters):
             for key, value in params.items()
         ]
         sql_set = ',\n    '.join(sql_set_list)
+        sql = 'SHOW ' + (
+            'GLOBAL '
+            if self.glob
+            else ''
+        ) + sql_set
 
-        ## Global.
-        if self.global_:
-            sql = f'SET GLOBAL {sql_set}'
+        # Execute SQL.
+        await self.db.execute(sql)
 
-        ## Not global.
-        else:
-            sql = f'SET {sql_set}'
 
-        # Execute SQL.
-        self.db.execute(sql)
+class DatabaseParametersVariables(DatabaseParameters):
+    """
+    Database variable parameters type.
+    """
+
+    mode: Final = 'VARIABLES'
+    glob: Final = False
+
+
+class DatabaseParametersStatus(DatabaseParameters):
+    """
+    Database status parameters type.
+    """
+
+    mode: Final = 'STATUS'
+    glob: Final = False
+
+
+class DatabaseParametersVariablesGlobal(DatabaseParameters):
+    """
+    Database global variable parameters type.
+    """
+
+    mode: Final = 'VARIABLES'
+    glob: Final = True
+
+
+class DatabaseParametersStatusGlobal(DatabaseParameters):
+    """
+    Database global status parameters type.
+    """
+
+    mode: Final = 'STATUS'
+    glob: Final = True
+
+
+class DatabaseParametersVariablesAsync(DatabaseParametersAsync):
+    """
+    Asynchrouous database variable parameters type.
+    """
+
+    mode: Final = 'VARIABLES'
+    glob: Final = False
+
+
+class DatabaseParametersStatusAsync(DatabaseParametersAsync):
+    """
+    Asynchrouous database status parameters type.
+    """
+
+    mode: Final = 'STATUS'
+    glob: Final = False
+
+
+class DatabaseParametersVariablesGlobalAsync(DatabaseParametersAsync):
+    """
+    Asynchrouous database global variable parameters type.
+    """
+
+    mode: Final = 'VARIABLES'
+    glob: Final = True
+
+
+class DatabaseParametersStatusGlobalAsync(DatabaseParametersAsync):
+    """
+    Asynchrouous database global status parameters type.
+    """
+
+    mode: Final = 'STATUS'
+    glob: Final = True

{reydb-1.1.59.dist-info → reydb-1.1.61.dist-info}/METADATA

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

reydb-1.1.61.dist-info/RECORD

@@ -0,0 +1,16 @@
+reydb/__init__.py,sha256=zuQ14sl7rZ6lQ1P566ALjiRi-PcIXj9Ff0U_yYNQHFE,581
+reydb/rall.py,sha256=8tWDeGRLKujqPHFy4898WCIgZEA4OxOfeQ8xG6Fw69c,387
+reydb/rbase.py,sha256=16fG_YWnvJFu0ElXvc3BS9PtSJFZ9M631Te0b2ewWDE,9457
+reydb/rbuild.py,sha256=-C8ORqJSa6tDBMm7Y-ZcN80sgWs5rX6I0aO0DioXNm4,46599
+reydb/rconfig.py,sha256=mA40xrC5O9Y3lHnuJYDRUqRsLk3s2BFxgXou2tnFAXM,21196
+reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
+reydb/rdb.py,sha256=Dh0J26fIfRrX8EK25cH1MfFzPLmWC-VnvXjLgiS_wFM,13824
+reydb/rerror.py,sha256=309PJVQG7jsL2A2R5IW4zuS4IojBgoGx3qxwIotBh_k,9896
+reydb/rexec.py,sha256=sOiapQnnbMhnItgYhUZ4iz8xRolsUJz6inCH1-7hb54,52074
+reydb/rfile.py,sha256=usK1W39O3Fi7FoAljhDIFgqj15c1GrQv3ASYUt1IxdA,15087
+reydb/rorm.py,sha256=heJf_vVJgjlNNQHbkpS_Q2rk8CBmRdOOSO7RZBfHulE,40355
+reydb/rparam.py,sha256=hXpnT4YnTgZFjyuc6bf2TCc-p1HQ7ycJjamq7I1xook,12851
+reydb-1.1.61.dist-info/METADATA,sha256=U2Xa2A4pdO1OKHmYgzphmIWh0cma7fCBi31grlX8iwQ,1622
+reydb-1.1.61.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.61.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.61.dist-info/RECORD,,