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

reydb/rdb.py

@@ -16,7 +16,7 @@ from sqlalchemy import Engine, create_engine as sqlalchemy_create_engine
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine as sqlalchemy_create_async_engine
 from reykit.rtext import join_data_text
 
-from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rfile, rinfo, rorm, rparam
+from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rfile, rorm, rparam
 
 
 __all__ = (
@@ -28,9 +28,14 @@ __all__ = (
 
 DatabaseConnectionT = TypeVar('DatabaseConnectionT', 'rconn.DatabaseConnection', 'rconn.DatabaseConnectionAsync')
 DatabaseExecuteT = TypeVar('DatabaseExecuteT', 'rexec.DatabaseExecute', 'rexec.DatabaseExecuteAsync')
-DatabaseSchemaT = TypeVar('DatabaseSchemaT', 'rparam.DatabaseSchema', 'rparam.DatabaseSchemaAsync')
 DatabaseORMT = TypeVar('DatabaseORMT', 'rorm.DatabaseORM', 'rorm.DatabaseORMAsync')
-DatabaseBuildT = TypeVar('DatabaseBuildT')
+DatabaseBuildT = TypeVar('DatabaseBuildT', 'rbuild.DatabaseBuild', 'rbuild.DatabaseBuildAsync')
+DatabaseConfigT = TypeVar('DatabaseConfigT', 'rconfig.DatabaseConfig', 'rconfig.DatabaseConfigAsync')
+DatabaseSchemaT = TypeVar('DatabaseSchemaT', 'rparam.DatabaseSchema', 'rparam.DatabaseSchemaAsync')
+DatabaseParametersVariablesT = TypeVar('DatabaseParametersVariablesT', 'rparam.DatabaseParametersVariables', 'rparam.DatabaseParametersVariablesAsync')
+DatabaseParametersStatusT = TypeVar('DatabaseParametersStatusT', 'rparam.DatabaseParametersStatus', 'rparam.DatabaseParametersStatusAsync')
+DatabaseParametersVariablesGlobalT = TypeVar('DatabaseParametersVariablesGlobalT', 'rparam.DatabaseParametersVariablesGlobal', 'rparam.DatabaseParametersVariablesGlobalAsync')
+DatabaseParametersStatusGlobalT = TypeVar('DatabaseParametersStatusGlobalT', 'rparam.DatabaseParametersStatusGlobal', 'rparam.DatabaseParametersStatusGlobalAsync')
 
 
 class DatabaseSuper(
@@ -39,9 +44,14 @@ class DatabaseSuper(
         rbase.EngineT,
         DatabaseConnectionT,
         DatabaseExecuteT,
-        DatabaseSchemaT,
         DatabaseORMT,
-        DatabaseBuildT
+        DatabaseBuildT,
+        DatabaseConfigT,
+        DatabaseSchemaT,
+        DatabaseParametersVariablesT,
+        DatabaseParametersStatusT,
+        DatabaseParametersVariablesGlobalT,
+        DatabaseParametersStatusGlobalT
     ]
 ):
     """
@@ -359,7 +369,7 @@ class DatabaseSuper(
 
 
     @property
-    def config(self):
+    def config(self) -> DatabaseConfigT:
         """
         Build database config instance.
 
@@ -369,45 +379,13 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbconfig = rconfig.DatabaseConfig(self)
-
-        return dbconfig
-
-
-    @property
-    def info(self):
-        """
-        Build database information schema instance.
-
-        Returns
-        -------
-        Instance.
-
-        Examples
-        --------
-        Get databases information of server.
-        >>> databases_info = DatabaseInformationSchema()
-
-        Get tables information of database.
-        >>> tables_info = DatabaseInformationSchema.database()
-
-        Get columns information of table.
-        >>> columns_info = DatabaseInformationSchema.database.table()
-
-        Get database attribute.
-        >>> database_attr = DatabaseInformationSchema.database['attribute']
-
-        Get table attribute.
-        >>> database_attr = DatabaseInformationSchema.database.table['attribute']
-
-        Get column attribute.
-        >>> database_attr = DatabaseInformationSchema.database.table.column['attribute']
-        """
-
-        # Build.
-        dbischema = rinfo.DatabaseInformationSchema(self)
+        match self:
+            case Database():
+                config = rconfig.DatabaseConfig(self)
+            case DatabaseAsync():
+                config = rconfig.DatabaseConfigAsync(self)
 
-        return dbischema
+        return config
 
 
     @property
@@ -431,9 +409,9 @@ class DatabaseSuper(
 
 
     @property
-    def status(self):
+    def var(self) -> DatabaseParametersVariablesT:
         """
-        Build database parameters status instance.
+        Build database parameters variable instance.
 
         Returns
         -------
@@ -441,15 +419,19 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbps = rparam.DatabaseParametersStatus(self, False)
+        match self:
+            case Database():
+                var = rparam.DatabaseParametersVariables(self)
+            case DatabaseAsync():
+                var = rparam.DatabaseParametersVariablesAsync(self)
 
-        return dbps
+        return var
 
 
     @property
-    def status_global(self):
+    def stat(self) -> DatabaseParametersVariablesT:
         """
-        Build global database parameters status instance.
+        Build database parameters status instance.
 
         Returns
         -------
@@ -457,15 +439,19 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbps = rparam.DatabaseParametersStatus(self, True)
+        match self:
+            case Database():
+                stat = rparam.DatabaseParametersStatus(self)
+            case DatabaseAsync():
+                stat = rparam.DatabaseParametersStatusAsync(self)
 
-        return dbps
+        return stat
 
 
     @property
-    def variables(self):
+    def glob_var(self) -> DatabaseParametersVariablesGlobalT:
         """
-        Build database parameters variable instance.
+        Build global database parameters variable instance.
 
         Returns
         -------
@@ -473,15 +459,19 @@ class DatabaseSuper(
         """
 
         # Build.
-        dbpv = rparam.DatabaseParametersVariable(self, False)
+        match self:
+            case Database():
+                var = rparam.DatabaseParametersVariablesGlobal(self)
+            case DatabaseAsync():
+                var = rparam.DatabaseParametersVariablesGlobalAsync(self)
 
-        return dbpv
+        return var
 
 
     @property
-    def variables_global(self):
+    def glob_stat(self) -> DatabaseParametersStatusGlobalT:
         """
-        Build global database parameters variable instance.
+        Build global database parameters status instance.
 
         Returns
         -------
@@ -489,11 +479,13 @@ class DatabaseSuper(
         """
 
         # Build.
+        match self:
+            case Database():
+                stat = rparam.DatabaseParametersStatusGlobal(self)
+            case DatabaseAsync():
+                stat = rparam.DatabaseParametersStatusGlobalAsync(self)
 
-        ## SQLite.
-        dbpv = rparam.DatabaseParametersVariable(self, True)
-
-        return dbpv
+        return stat
 
 
 class Database(
@@ -501,9 +493,14 @@ class Database(
         Engine,
         'rconn.DatabaseConnection',
         'rexec.DatabaseExecute',
-        'rparam.DatabaseSchema',
         'rorm.DatabaseORM',
-        'rbuild.DatabaseBuild'
+        'rbuild.DatabaseBuild',
+        'rconfig.DatabaseConfig',
+        'rparam.DatabaseSchema',
+        'rparam.DatabaseParametersVariables',
+        'rparam.DatabaseParametersStatus',
+        'rparam.DatabaseParametersVariablesGlobal',
+        'rparam.DatabaseParametersStatusGlobal'
     ]
 ):
     """
@@ -516,9 +513,14 @@ class DatabaseAsync(
         AsyncEngine,
         'rconn.DatabaseConnectionAsync',
         'rexec.DatabaseExecuteAsync',
-        'rparam.DatabaseSchemaAsync',
         'rorm.DatabaseORMAsync',
-        'rbuild.DatabaseBuildAsync'
+        'rbuild.DatabaseBuildAsync',
+        'rconfig.DatabaseConfigAsync',
+        'rparam.DatabaseSchemaAsync',
+        'rparam.DatabaseParametersVariablesAsync',
+        'rparam.DatabaseParametersStatusAsync',
+        'rparam.DatabaseParametersVariablesGlobalAsync',
+        'rparam.DatabaseParametersStatusGlobalAsync'
     ]
 ):
     """

reydb/rexec.py

@@ -29,6 +29,7 @@ from .rbase import DatabaseBase, handle_sql, handle_data, extract_path
 
 __all__ = (
     'Result',
+    'DatabaseExecuteSuper',
     'DatabaseExecute',
     'DatabaseExecuteAsync'
 )
@@ -541,9 +542,9 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
     def handle_copy(
         self,
         table: str,
+        fields: str | Iterable[str] | None = None,
         where: str | None = None,
-        limit: int | str | tuple[int, int] | None = None,
-        **kwdata: Any
+        limit: int | str | tuple[int, int] | None = None
     ) -> Result:
         """
         Execute inesrt SQL of copy records.
@@ -551,15 +552,14 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         Parameters
         ----------
         table : Table name, can include database name.
+        fields : Select clause content.
+            - `None`: Is `SELECT *`.
+            - `str`: Join as `SELECT str`.
+            - `Iterable[str]`: Join as `SELECT str`.
         where : Clause `WHERE` content, join as `WHERE str`.
         limit : Clause `LIMIT` content.
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
-        kwdata : Keyword parameters for filling.
-            - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
-            - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
-                `str and first character is ':'`: Use this syntax.
-                `Any`: Use this value.
 
         Returns
         -------
@@ -570,72 +570,23 @@ class DatabaseExecuteSuper(DatabaseBase, Generic[DatabaseConnectionT]):
         database = self.conn.db.database
         if '.' in table:
             database, table, _ = extract_path(table)
-        table_info: list[dict] = self.conn.db.info(database)(table)()
-        field_key = 'COLUMN_NAME'
-        fields = [
-            row[field_key]
-            for row in table_info
-        ]
-        pattern = '(?<!\\\\):(\\w+)'
-        if type(where) == str:
-            where_keys = findall(pattern, where)
-        else:
-            where_keys = ()
+        if fields is None:
+            fields = '*'
+        elif type(fields) != str:
+            fields = ', '.join(fields)
 
         # Generate SQL.
         sqls = []
 
         ## Part 'INSERT' syntax.
-        sql_fields = ', '.join(
-            f'`{field}`'
-            for field in fields
-            if field not in kwdata
-        )
-        if kwdata != {}:
-            sql_fields_kwdata = ', '.join(
-                f'`{field}`'
-                for field in kwdata
-                if field not in where_keys
-            )
-            sql_fields_filter = filter(
-                lambda sql: sql != '',
-                (
-                    sql_fields,
-                    sql_fields_kwdata
-                )
-            )
-            sql_fields = ', '.join(sql_fields_filter)
-        sql_insert = f'INSERT INTO `{database}`.`{table}`({sql_fields})'
+        sql_insert = f'INSERT INTO `{database}`.`{table}`'
+        if fields != '*':
+            sql_insert += f'({fields})'
         sqls.append(sql_insert)
 
         ## Part 'SELECT' syntax.
-        sql_values = ', '.join(
-            f'`{field}`'
-            for field in fields
-            if field not in kwdata
-        )
-        if kwdata != {}:
-            sql_values_kwdata = ', '.join(
-                value[1:]
-                if (
-                    type(value) == str
-                    and value.startswith(':')
-                    and value != ':'
-                )
-                else f':{field}'
-                for field, value in kwdata.items()
-                if field not in where_keys
-            )
-            sql_values_filter = filter(
-                lambda sql: sql != '',
-                (
-                    sql_values,
-                    sql_values_kwdata
-                )
-            )
-            sql_values = ', '.join(sql_values_filter)
         sql_select = (
-            f'SELECT {sql_values}\n'
+            f'SELECT {fields}\n'
             f'FROM `{database}`.`{table}`'
         )
         sqls.append(sql_select)
@@ -954,6 +905,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
     def copy(
         self,
         table: str,
+        fields: str | Iterable[str] | None = None,
         where: str | None = None,
         limit: int | str | tuple[int, int] | None = None,
         report: bool | None = None,
@@ -965,17 +917,15 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         Parameters
         ----------
         table : Table name, can include database name.
+        fields : Select clause content.
+            - `None`: Is `SELECT *`.
+            - `str`: Join as `SELECT str`.
+            - `Iterable[str]`: Join as `SELECT str`.
         where : Clause `WHERE` content, join as `WHERE str`.
         limit : Clause `LIMIT` content.
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
-        report : Whether report SQL execute information.
-            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
-            - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
-            - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
-                `str and first character is ':'`: Use this syntax.
-                `Any`: Use this value.
 
         Returns
         -------
@@ -992,7 +942,7 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
         """
 
         # Handle parameter.
-        sql = self.handle_copy(table, where, limit, **kwdata)
+        sql = self.handle_copy(table, fields, where, limit)
 
         # Execute SQL.
         result = self.execute(sql, report=report, **kwdata)
@@ -1492,6 +1442,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
     async def copy(
         self,
         table: str,
+        fields: str | Iterable[str] | None = None,
         where: str | None = None,
         limit: int | str | tuple[int, int] | None = None,
         report: bool | None = None,
@@ -1503,17 +1454,15 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         Parameters
         ----------
         table : Table name, can include database name.
+        fields : Select clause content.
+            - `None`: Is `SELECT *`.
+            - `str`: Join as `SELECT str`.
+            - `Iterable[str]`: Join as `SELECT str`.
         where : Clause `WHERE` content, join as `WHERE str`.
         limit : Clause `LIMIT` content.
             - `int | str`: Join as `LIMIT int/str`.
             - `tuple[int, int]`: Join as `LIMIT int, int`.
-        report : Whether report SQL execute information.
-            - `None`: Use attribute `Database.report`.
         kwdata : Keyword parameters for filling.
-            - `In 'WHERE' syntax`: Fill 'WHERE' syntax.
-            - `Not in 'WHERE' syntax`: Fill 'INSERT' and 'SELECT' syntax.
-                `str and first character is ':'`: Use this syntax.
-                `Any`: Use this value.
 
         Returns
         -------
@@ -1530,7 +1479,7 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         """
 
         # Handle parameter.
-        sql = self.handle_copy(table, where, limit, **kwdata)
+        sql = self.handle_copy(table, fields, where, limit)
 
         # Execute SQL.
         result = await self.execute(sql, report=report, **kwdata)

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
@@ -100,7 +101,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
         """
 
         # Handle parameter.
-        if attrs['__module__'] == '__main__':
+        if '__annotations__' in attrs:
             table_args = attrs.setdefault('__table_args__', {})
             table_args['quote'] = True
 
@@ -110,7 +111,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
 
             ## Name.
             if '__name__' in attrs:
-                table_args['name'] = attrs.pop('__name__')
+                name = attrs.pop('__name__')
 
             ## Comment.
             if '__comment__' in attrs:
@@ -232,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.
 
@@ -249,7 +250,7 @@ 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,
@@ -286,6 +287,8 @@ 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.
@@ -356,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: