reydb 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

reydb/{rparam.py → rinfo.py}

@@ -5,7 +5,7 @@
 @Time    : 2022-12-05 14:10:02
 @Author  : Rey
 @Contact : reyxbo@163.com
-@Explain : Database parameter methods.
+@Explain : Database information methods.
 """
 
 
@@ -17,29 +17,36 @@ from .rexec import Result
 
 
 __all__ = (
-    'DatabaseSchemaSuper',
-    'DatabaseSchema',
-    'DatabaseSchemaAsync',
-    'DatabaseParametersSuper',
-    'DatabaseParameters',
-    'DatabaseParametersAsync',
-    'DatabaseParametersVariables',
-    'DatabaseParametersStatus',
-    'DatabaseParametersVariablesGlobal',
-    'DatabaseParametersStatusGlobal',
-    'DatabaseParametersVariablesAsync',
-    'DatabaseParametersStatusAsync',
-    'DatabaseParametersVariablesGlobalAsync',
-    'DatabaseParametersStatusGlobalAsync'
+    'DatabaseInformationBase',
+    'DatabaseInformationSchemaSuper',
+    'DatabaseInformationSchema',
+    'DatabaseInformationSchemaAsync',
+    'DatabaseInformationParameterSuper',
+    'DatabaseInformationParameter',
+    'DatabaseInformationParameterAsync',
+    'DatabaseInformationParameterVariables',
+    'DatabaseInformationParameterStatus',
+    'DatabaseInformationParameterVariablesGlobal',
+    'DatabaseInformationParameterStatusGlobal',
+    'DatabaseInformationParameterVariablesAsync',
+    'DatabaseInformationParameterStatusAsync',
+    'DatabaseInformationParameterVariablesGlobalAsync',
+    'DatabaseInformationParameterStatusGlobalAsync'
 )
 
 
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
-class DatabaseSchemaSuper(DatabaseBase, Generic[DatabaseT]):
+class DatabaseInformationBase(DatabaseBase):
     """
-    Database schema super type.
+    Database information base type.
+    """
+
+
+class DatabaseInformationSchemaSuper(DatabaseInformationBase, Generic[DatabaseT]):
+    """
+    Database information schema super type.
     """
 
 
@@ -68,7 +75,7 @@ class DatabaseSchemaSuper(DatabaseBase, Generic[DatabaseT]):
         Parameter `sql` and `filter_db`.
         """
 
-        # Handle parameter.
+        # Set parameter.
         filter_db = (
             'information_schema',
             'performance_schema',
@@ -186,7 +193,7 @@ class DatabaseSchemaSuper(DatabaseBase, Generic[DatabaseT]):
         Judge result.
         """
 
-        # Handle parameter.
+        # Set parameter.
 
         # Judge.
         judge = (
@@ -207,9 +214,9 @@ class DatabaseSchemaSuper(DatabaseBase, Generic[DatabaseT]):
         return judge
 
 
-class DatabaseSchema(DatabaseSchemaSuper['rdb.Database']):
+class DatabaseInformationSchema(DatabaseInformationSchemaSuper['rdb.Database']):
     """
-    Database schema type.
+    Database information schema type.
     """
 
 
@@ -291,7 +298,7 @@ class DatabaseSchema(DatabaseSchemaSuper['rdb.Database']):
         Judge result.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if (
             refresh
             or self.db._schema is None
@@ -306,9 +313,9 @@ class DatabaseSchema(DatabaseSchemaSuper['rdb.Database']):
         return result
 
 
-class DatabaseSchemaAsync(DatabaseSchemaSuper['rdb.DatabaseAsync']):
+class DatabaseInformationSchemaAsync(DatabaseInformationSchemaSuper['rdb.DatabaseAsync']):
     """
-    Asynchronous database schema type.
+    Asynchronous database information schema type.
     """
 
 
@@ -388,7 +395,7 @@ class DatabaseSchemaAsync(DatabaseSchemaSuper['rdb.DatabaseAsync']):
         Judge result.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if (
             refresh
             or self.db._schema is None
@@ -403,9 +410,9 @@ class DatabaseSchemaAsync(DatabaseSchemaSuper['rdb.DatabaseAsync']):
         return result
 
 
-class DatabaseParametersSuper(DatabaseBase, Generic[DatabaseT]):
+class DatabaseInformationParameterSuper(DatabaseInformationBase, Generic[DatabaseT]):
     """
-    Database parameters super type.
+    Database information parameters super type.
     """
 
     mode: Literal['VARIABLES', 'STATUS']
@@ -428,9 +435,9 @@ class DatabaseParametersSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-class DatabaseParameters(DatabaseParametersSuper['rdb.Database']):
+class DatabaseInformationParameter(DatabaseInformationParameterSuper['rdb.Database']):
     """
-    Database parameters type.
+    Database information parameters type.
     """
 
 
@@ -550,9 +557,9 @@ class DatabaseParameters(DatabaseParametersSuper['rdb.Database']):
         self.db.execute(sql)
 
 
-class DatabaseParametersAsync(DatabaseParametersSuper['rdb.DatabaseAsync']):
+class DatabaseInformationParameterAsync(DatabaseInformationParameterSuper['rdb.DatabaseAsync']):
     """
-    Asynchrouous database parameters type.
+    Asynchrouous database information parameters type.
     """
 
 
@@ -676,72 +683,72 @@ class DatabaseParametersAsync(DatabaseParametersSuper['rdb.DatabaseAsync']):
         await self.db.execute(sql)
 
 
-class DatabaseParametersVariables(DatabaseParameters):
+class DatabaseInformationParameterVariables(DatabaseInformationParameter):
     """
-    Database variable parameters type.
+    Database information variable parameters type.
     """
 
     mode: Final = 'VARIABLES'
     glob: Final = False
 
 
-class DatabaseParametersStatus(DatabaseParameters):
+class DatabaseInformationParameterStatus(DatabaseInformationParameter):
     """
-    Database status parameters type.
+    Database information status parameters type.
     """
 
     mode: Final = 'STATUS'
     glob: Final = False
 
 
-class DatabaseParametersVariablesGlobal(DatabaseParameters):
+class DatabaseInformationParameterVariablesGlobal(DatabaseInformationParameter):
     """
-    Database global variable parameters type.
+    Database information global variable parameters type.
     """
 
     mode: Final = 'VARIABLES'
     glob: Final = True
 
 
-class DatabaseParametersStatusGlobal(DatabaseParameters):
+class DatabaseInformationParameterStatusGlobal(DatabaseInformationParameter):
     """
-    Database global status parameters type.
+    Database information global status parameters type.
     """
 
     mode: Final = 'STATUS'
     glob: Final = True
 
 
-class DatabaseParametersVariablesAsync(DatabaseParametersAsync):
+class DatabaseInformationParameterVariablesAsync(DatabaseInformationParameterAsync):
     """
-    Asynchrouous database variable parameters type.
+    Asynchrouous database information variable parameters type.
     """
 
     mode: Final = 'VARIABLES'
     glob: Final = False
 
 
-class DatabaseParametersStatusAsync(DatabaseParametersAsync):
+class DatabaseInformationParameterStatusAsync(DatabaseInformationParameterAsync):
     """
-    Asynchrouous database status parameters type.
+    Asynchrouous database information status parameters type.
     """
 
     mode: Final = 'STATUS'
     glob: Final = False
 
 
-class DatabaseParametersVariablesGlobalAsync(DatabaseParametersAsync):
+class DatabaseInformationParameterVariablesGlobalAsync(DatabaseInformationParameterAsync):
     """
-    Asynchrouous database global variable parameters type.
+    Asynchrouous database information global variable parameters type.
     """
 
     mode: Final = 'VARIABLES'
     glob: Final = True
 
 
-class DatabaseParametersStatusGlobalAsync(DatabaseParametersAsync):
+class DatabaseInformationParameterStatusGlobalAsync(DatabaseInformationParameterAsync):
     """
-    Asynchrouous database global status parameters type.
+    Asynchrouous database information global status parameters type.
     """
 
     mode: Final = 'STATUS'

reydb/rorm.py

@@ -25,6 +25,7 @@ from sqlmodel import SQLModel, Session, Table
 from sqlmodel.ext.asyncio.session import AsyncSession
 from sqlmodel.main import SQLModelMetaclass, FieldInfo, default_registry
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
+from datetime import datetime, date, time, timedelta
 from reykit.rbase import CallableT, Null, throw, is_instance
 
 from . import rdb
@@ -274,8 +275,9 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
             kwargs['sa_type'] = kwargs.pop('field_type')
 
         ## Key auto.
-        if 'key_auto' in kwargs:
+        if kwargs.get('key_auto'):
             kwargs['sa_column_kwargs']['autoincrement'] = True
+            kwargs['primary_key'] = True
         else:
             kwargs['sa_column_kwargs']['autoincrement'] = False
 
@@ -419,27 +421,8 @@ class DatabaseORMModelMethod(DatabaseORMBase):
 class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseT, DatabaseORMSessionT]):
     """
     Database ORM super type.
-
-    Attributes
-    ----------
-    metaData : Registry metadata instance.
-    DatabaseModel : Database ORM model type.
-    Field : Database ORM model field type.
-    Config : Database ORM model config type.
-    types : Database ORM model filed types module.
-    wrap_validate_model : Create decorator of validate database ORM model.
-    wrap_validate_filed : Create decorator of validate database ORM model field.
     """
 
-    metaData = default_registry.metadata
-    Model = DatabaseORMModel
-    Field = DatabaseORMModelField
-    Config = ConfigDict
-    types = types
-    types_mysql = types_mysql
-    wrap_validate_model = pydantic_model_validator
-    wrap_validate_filed = pydantic_field_validator
-
 
     def __init__(self, db: DatabaseT) -> None:
         """
@@ -852,7 +835,7 @@ class DatabaseORMSession(
             throw(ValueError, tables)
 
         # Create.
-        self.orm.metaData.create_all(self.orm.db.engine, tables, skip)
+        metadata.create_all(self.orm.db.engine, tables, skip)
 
 
     @wrap_transact
@@ -881,7 +864,7 @@ class DatabaseORMSession(
             throw(ValueError, tables)
 
         # Drop.
-        self.orm.metaData.drop_all(self.orm.db.engine, tables, skip)
+        metadata.drop_all(self.orm.db.engine, tables, skip)
 
 
     @wrap_transact
@@ -1219,7 +1202,7 @@ class DatabaseORMSessionAsync(
 
         # Create.
         conn = await self.sess.connection()
-        await conn.run_sync(self.orm.metaData.create_all, tables, skip)
+        await conn.run_sync(metadata.create_all, tables, skip)
 
 
     @wrap_transact
@@ -1249,7 +1232,7 @@ class DatabaseORMSessionAsync(
 
         # Drop.
         conn = await self.sess.connection()
-        await conn.run_sync(self.orm.metaData.drop_all, tables, skip)
+        await conn.run_sync(metadata.drop_all, tables, skip)
 
 
     @wrap_transact
@@ -1587,3 +1570,36 @@ class DatabaseORMStatementDeleteAsync(DatabaseORMStatementAsync[None], Delete, G
     """
 
     inherit_cache: Final = True
+
+
+# Simple path.
+
+## Registry metadata instance.
+metadata = default_registry.metadata
+
+## Database ORM model type.
+Model = DatabaseORMModel
+
+## Database ORM model field type.
+Field = DatabaseORMModelField
+
+## Database ORM model config type.
+Config = ConfigDict
+
+## Database ORM model filed types.
+types = types
+
+## Database ORM model MySQL filed types.
+types_mysql = types_mysql
+
+## Create decorator of validate database ORM model.
+wrap_validate_model = pydantic_model_validator
+
+## Create decorator of validate database ORM model field.
+wrap_validate_filed = pydantic_field_validator
+
+## Time type.
+Datetime = datetime
+Date = date
+Time = time
+Timedelta = timedelta

{reydb-1.2.0.dist-info → reydb-1.2.2.dist-info}/METADATA

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

reydb-1.2.2.dist-info/RECORD

@@ -0,0 +1,15 @@
+reydb/__init__.py,sha256=4mnlkfJfkBfxBpCotVUJ86f4AnT8plqlFbGiH3vZ4PM,550
+reydb/rall.py,sha256=IxSPGh77xz7ndDC7J8kZ_66Gq_xTAztGtnELUku1Ouw,364
+reydb/rbase.py,sha256=vx37yV6LlWP89nWAfYyOf0Xm3N_e9eB8z5Mxe-aTEo4,8248
+reydb/rbuild.py,sha256=rmwfkjxjhavcbyn-V0ZTqwKNq3wKmgvHng8p5I0dghQ,40281
+reydb/rconfig.py,sha256=5ZfFQwgt6JI5k1luv7PIj3H9Izuc6KNMOCFCJGBb1rQ,18998
+reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
+reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
+reydb/rerror.py,sha256=renVDvi5e6-AC-y2KPksARPRX978WFh0Hqa9yfl9j1A,14735
+reydb/rexec.py,sha256=djHx311c6mr1IjzNLqnGe-4yr3qNmYGUy4pHQA3WElQ,53042
+reydb/rinfo.py,sha256=9qpVFqFwMol5_n9gE3zYLv9Fn5r2EuVD5ibgQkSXYyw,18168
+reydb/rorm.py,sha256=X99AKlpMQk3et9_3x1ddpKn1BxZRULLG8x_opYbWVX8,40934
+reydb-1.2.2.dist-info/METADATA,sha256=J_Jq9TRbL2LRW154knFoOtwv8wWVQQqhfup0YTfEwRM,1621
+reydb-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.2.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.2.dist-info/RECORD,,

reydb-1.2.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-reydb/__init__.py,sha256=G2U0uiNjk2koYxIZjf9zvHoiQFO485XMnfQBMYSUdRc,549
-reydb/rall.py,sha256=sOeiVXSIo2voFiiZaRx8h7_wWrx8fFjXkRQRSYHQccA,365
-reydb/rbase.py,sha256=0QGHxbdrcyDTY6BK7zMCTM9cRDkZyVNlL7S1j7A4Zp0,8260
-reydb/rbuild.py,sha256=R_WQNpp67oHZFZlRuui_vaZAlJL4s_y5NX0gJXZY1yA,40320
-reydb/rconfig.py,sha256=mVRrkWa35stM5_sB0rD7VtgqLkVDv0BDnV_u2AGh0kI,18962
-reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
-reydb/rdb.py,sha256=QB9het4tAPnJo4urWJ4oePI1g1avNI8O1P0-VPJLDEo,13809
-reydb/rerror.py,sha256=LlEmKREe88QKLU3xf4mF88nXnGSQodrUruQAm9ifUeQ,14781
-reydb/rexec.py,sha256=NLSvwwFhf60OndW3pjffzyMbWcLykhTbBbfI1YSueQ8,53223
-reydb/rorm.py,sha256=IipUvaFnS0gfHxzYkNSuM60skYsIGNBA9DvD8DnTpCc,40885
-reydb/rparam.py,sha256=S32dAKrCM0c4Qm-fhZkIRRhshsK1MmI12NgavNBfvJg,17443
-reydb-1.2.0.dist-info/METADATA,sha256=0wocK72W-r7ZRvnaiZ4JFfJ9RLVCkXs2u6yrx1foDFw,1621
-reydb-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.0.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.0.dist-info/RECORD,,