reydb 1.2.4__py3-none-any.whl → 1.2.6__py3-none-any.whl

reydb/rconfig.py

@@ -24,7 +24,7 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
-    'TableConfig',
+    'DatabaseTableConfig',
     'DatabaseConfigSuper',
     'DatabaseConfig',
     'DatabaseConfigAsync'
@@ -38,14 +38,14 @@ ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
-class TableConfig(rorm.Model, table=True):
+class DatabaseTableConfig(rorm.Model, table=True):
     """
     Database `config` table model.
     """
 
     __comment__ = 'Config data table.'
     create_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', not_null=True, index_n=True, comment='Config create time.')
-    update_time: rorm.Datetime = rorm.Field(field_default='CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
+    update_time: rorm.Datetime = rorm.Field(field_default='ON UPDATE CURRENT_TIMESTAMP', index_n=True, comment='Config update time.')
     key: str = rorm.Field(field_type=rorm.types.VARCHAR(50), key=True, comment='Config key.')
     value: str = rorm.Field(field_type=rorm.types.TEXT, not_null=True, comment='Config value.')
     type: str = rorm.Field(field_type=rorm.types.VARCHAR(50), not_null=True, comment='Config value type.')
@@ -81,7 +81,7 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> tuple[list[type[TableConfig]], list[dict[str, Any]]] :
+    def handle_build_db(self) -> tuple[list[type[DatabaseTableConfig]], list[dict[str, Any]]] :
         """
         Handle method of check and build database tables, by `self.db_names`.
 
@@ -91,10 +91,10 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseT]):
         """
 
         # Set parameter.
-        TableConfig._set_name(self.db_names['config'])
 
         ## Table.
-        tables = [TableConfig]
+        DatabaseTableConfig._set_name(self.db_names['config'])
+        tables = [DatabaseTableConfig]
 
         ## View stats.
         views_stats = [

reydb/rerror.py

@@ -22,7 +22,7 @@ from .rbase import DatabaseBase
 
 
 __all__ = (
-    'TableError',
+    'DatabaseTableError',
     'DatabaseErrorSuper',
     'DatabaseError',
     'DatabaseErrorAsync'
@@ -32,7 +32,7 @@ __all__ = (
 DatabaseT = TypeVar('DatabaseT', 'rdb.Database', 'rdb.DatabaseAsync')
 
 
-class TableError(rorm.Model, table=True):
+class DatabaseTableError(rorm.Model, table=True):
     """
     Database `error` table model.
     """
@@ -75,7 +75,7 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         self.db = db
 
 
-    def handle_build_db(self) -> tuple[list[type[TableError]], list[dict[str, Any]]]:
+    def handle_build_db(self) -> tuple[list[type[DatabaseTableError]], list[dict[str, Any]]]:
         """
         Handle method of check and build database tables, by `self.db_names`.
 
@@ -85,10 +85,10 @@ class DatabaseErrorSuper(DatabaseBase, Generic[DatabaseT]):
         """
 
         # Set parameter.
-        TableError._set_name(self.db_names['error'])
 
         ## Table.
-        tables = [TableError]
+        DatabaseTableError._set_name(self.db_names['error'])
+        tables = [DatabaseTableError]
 
         ## View stats.
         views_stats = [

reydb/rorm.py

@@ -103,10 +103,11 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
         kwargs : Type other key arguments.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if '__annotations__' in attrs:
             table_args = attrs.setdefault('__table_args__', {})
             table_args['quote'] = True
+            table_name = name.lower()
 
             ## Charset.
             attrs.setdefault('__charset__', 'utf8mb4')
@@ -114,7 +115,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
 
             ## Name.
             if '__name__' in attrs:
-                attrs['__tablename__'] = attrs.pop('__name__')
+                attrs['__tablename__'] = table_name = attrs.pop('__name__')
 
             ## Comment.
             if '__comment__' in attrs:
@@ -128,12 +129,43 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
                 sa_column_kwargs: dict = field.sa_column_kwargs
                 sa_column_kwargs.setdefault('name', __name__)
 
+            ## Unique.
+            table = default_registry.metadata.tables.get(table_name)
+            if table is not None:
+                default_registry.metadata.remove(table)
+
         # Super.
         new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
 
         return new_cls
 
 
+    def __init__(
+        cls,
+        name: str,
+        bases: tuple[Type],
+        attrs: dict[str, Any],
+        **kwargs: Any
+    ) -> None:
+        """
+        Build type attributes.
+        """
+
+        # Super.
+        super().__init__(name, bases, attrs, **kwargs)
+
+        # Set parameter.
+        if '__annotations__' in attrs:
+            table: Table = cls.__table__
+            for index in table.indexes:
+                index_name_prefix = ['u_', 'n_'][index.unique]
+                index_name = index_name_prefix + '_'.join(
+                    column.key
+                    for column in index.expressions
+                )
+                index.name = index_name
+
+
 class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
     """
     Database ORM model filed type.
@@ -214,7 +246,7 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
         **kwargs : Other key arguments.
         """
 
-        # Handle parameter.
+        # Set parameter.
         kwargs = {
             key: value
             for key, value in kwargs.items()
@@ -578,7 +610,7 @@ class DatabaseORMSessionSuper(
         Instance.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -605,7 +637,7 @@ class DatabaseORMSessionSuper(
         Instance.
         """
         print(model)
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -632,7 +664,7 @@ class DatabaseORMSessionSuper(
         Instance.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -659,7 +691,7 @@ class DatabaseORMSessionSuper(
         Instance.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -846,7 +878,7 @@ class DatabaseORMSession(
         skip : Whether skip existing table.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables = [
             model._get_table()
             for model in models
@@ -875,7 +907,7 @@ class DatabaseORMSession(
         skip : Skip not exist table.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables = [
             model._get_table()
             for model in models
@@ -906,7 +938,7 @@ class DatabaseORMSession(
         With records ORM model instance or null.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -940,7 +972,7 @@ class DatabaseORMSession(
         With records ORM model instance list.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -968,7 +1000,7 @@ class DatabaseORMSession(
         With records ORM model instance list.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -1212,7 +1244,7 @@ class DatabaseORMSessionAsync(
         skip : Whether skip existing table.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables = [
             model._get_table()
             for model in models
@@ -1242,7 +1274,7 @@ class DatabaseORMSessionAsync(
         skip : Skip not exist table.
         """
 
-        # Handle parameter.
+        # Set parameter.
         tables = [
             model._get_table()
             for model in models
@@ -1274,7 +1306,7 @@ class DatabaseORMSessionAsync(
         With records ORM model instance or null.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -1308,7 +1340,7 @@ class DatabaseORMSessionAsync(
         With records ORM model instance list.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 
@@ -1336,7 +1368,7 @@ class DatabaseORMSessionAsync(
         With records ORM model instance list.
         """
 
-        # Handle parameter.
+        # Set parameter.
         if is_instance(model):
             model = type(model)
 

{reydb-1.2.4.dist-info → reydb-1.2.6.dist-info}/METADATA

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

{reydb-1.2.4.dist-info → reydb-1.2.6.dist-info}/RECORD

@@ -2,14 +2,14 @@ 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=imakdlqQXzQlbAukti3_REVU_h7IRRE3fwUk91LaIIM,80430
-reydb/rconfig.py,sha256=Z8h23-w_FTiDMu9-1Bdu6xpRqJt1j8EESNq0MsJRies,19157
+reydb/rconfig.py,sha256=JvNf9LU6CzD9eThM8BZz0EVJeDgALmX8JHpY_mXR5mg,19207
 reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
 reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
-reydb/rerror.py,sha256=cB3xAq1Zy97Mvq43ql9o-WtoSvgluXKqaQwHrHETrY8,14884
+reydb/rerror.py,sha256=Cmbcz5CgpI2ro7CbFHUYWP6zuiFJoxy_ENzSUNuuwe8,14924
 reydb/rexec.py,sha256=djHx311c6mr1IjzNLqnGe-4yr3qNmYGUy4pHQA3WElQ,53042
 reydb/rinfo.py,sha256=LjrqTA7JJbWJsjXwV-zKpbE1htv-whg6239hoQj4yIU,18151
-reydb/rorm.py,sha256=2C2g0zd188pf9VoGH52TiVZkjd9y9YAZTqU4XJUSlhA,41411
-reydb-1.2.4.dist-info/METADATA,sha256=9f-mOq7OwHoRXtkOLKzkNskD7dt1s59Dv5foLX6N_Nw,1621
-reydb-1.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.4.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.4.dist-info/RECORD,,
+reydb/rorm.py,sha256=baHqpNqnBaE1qQpsc5TaegJBbOhWnl748rPPzO7Ab6Q,42314
+reydb-1.2.6.dist-info/METADATA,sha256=O94lfy2GvYZTAHXYwRlts15238S9IqTmoTIyDiwmJyo,1621
+reydb-1.2.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.6.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.6.dist-info/RECORD,,