reydb 1.2.10__py3-none-any.whl → 1.2.12__py3-none-any.whl

reydb/rconfig.py

@@ -170,11 +170,13 @@ class DatabaseConfig(DatabaseConfigSuper['rdb.Database']):
         """
 
         # Get.
-        result = self.db.execute.select(
-            self.db_names['config'],
-            ['key', 'value', 'type', 'note'],
-            order='IFNULL(`update_time`, `create_time`) DESC'
-        )
+        result = self.db.orm.select(
+            DatabaseTableConfig
+        ).fields(
+            DatabaseTableConfig.key, DatabaseTableConfig.value, DatabaseTableConfig.type, DatabaseTableConfig.note
+        ).order_by(
+            rorm.funcs.IFNULL(DatabaseTableConfig.update_time, DatabaseTableConfig.create_time).desc()
+        ).execute()
 
         # Convert.
         global_dict = {'datetime': Datetime}

reydb/rexec.py

@@ -17,7 +17,6 @@ from reykit.rbase import throw, get_first_notnone
 from reykit.rdata import FunctionGenerator
 from reykit.rmonkey import monkey_sqlalchemy_result_more_fetch, monkey_sqlalchemy_row_index_field
 from reykit.rrand import randn
-from reykit.rre import findall
 from reykit.rstdout import echo as recho
 from reykit.rtable import TableData, Table
 from reykit.rtime import TimeMark, time_to

reydb/rorm.py

@@ -9,22 +9,22 @@
 """
 
 
-from typing import Self, Any, Type, Literal, TypeVar, Generic, Final, overload
+from typing import Self, Any, Type, Literal, TypeVar, Generic, Final, NoReturn, 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 import types, text as sqlalchemy_text
+from sqlalchemy.orm import SessionTransaction, load_only
+from sqlalchemy.orm.strategy_options import _AttrType
+from sqlalchemy.sql import func as sqlalchemy_func
+from sqlalchemy.sql.dml import Insert, Update, Delete
+from sqlalchemy.sql.sqltypes import TypeEngine
 from sqlalchemy.ext.asyncio import AsyncSessionTransaction
-from sqlalchemy import types
 from sqlalchemy.dialects.mysql import types as types_mysql
-from sqlalchemy.sql.sqltypes import TypeEngine
-from sqlalchemy.sql.dml import Insert, Update, Delete
-from sqlalchemy.sql import func as sqlalchemy_func
 from sqlmodel import SQLModel, Session, Table
-from sqlmodel.ext.asyncio.session import AsyncSession
 from sqlmodel.main import SQLModelMetaclass, FieldInfo, default_registry
+from sqlmodel.ext.asyncio.session import AsyncSession
 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
@@ -1503,6 +1503,10 @@ class DatabaseORMStatementSuper(DatabaseORMBase, Generic[DatabaseORMSessionT]):
         self.model = model
 
 
+    @overload
+    def with_only_columns(self) -> NoReturn: ...
+
+
 class DatabaseORMStatement(DatabaseORMStatementSuper[DatabaseORMSession], Generic[DatabaseORMStatementReturn]):
     """
     Database ORM statement type.
@@ -1532,7 +1536,8 @@ class DatabaseORMStatement(DatabaseORMStatementSuper[DatabaseORMSession], Generi
             ## Select.
             if isinstance(self, Select):
                 for model in result:
-                    self.sess.sess.expunge(model)
+                    if isinstance(model, DatabaseORMModel):
+                        self.sess.sess.expunge(model)
 
             self.sess.commit()
             self.sess.close()
@@ -1569,7 +1574,8 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
             ## Select.
             if isinstance(self, Select):
                 for model in result:
-                    self.sess.sess.expunge(model)
+                    if isinstance(model, DatabaseORMModel):
+                        self.sess.sess.expunge(model)
 
             await self.sess.commit()
             await self.sess.close()
@@ -1578,7 +1584,39 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
         return result
 
 
-class DatabaseORMStatementSelect(DatabaseORMStatement, Select, Generic[DatabaseORMStatementReturn]):
+class DatabaseORMStatementSelectSuper(DatabaseORMStatementSuper, Select):
+    """
+    Database ORM `select` statement type.
+
+    Attributes
+    ----------
+    inherit_cache : Compatible `Select` type.
+    """
+
+    inherit_cache: Final = True
+
+
+    def fields(self, *field: _AttrType) -> Self:
+        """
+        Replace select fiedls.
+
+        Parameters
+        ----------
+        field : Field set.
+
+        Returns
+        -------
+        Set self.
+        """
+
+        # Set.
+        set = load_only(*field)
+        select = self.options(set)
+
+        return select
+
+
+class DatabaseORMStatementSelect(DatabaseORMStatement, DatabaseORMStatementSelectSuper, Generic[DatabaseORMStatementReturn]):
     """
     Database ORM `select` statement type.
 
@@ -1632,7 +1670,7 @@ class DatabaseORMStatementDelete(DatabaseORMStatement[None], Delete):
     inherit_cache: Final = True
 
 
-class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, Select):
+class DatabaseORMStatementSelectAsync(DatabaseORMStatementAsync, DatabaseORMStatementSelectSuper, Generic[DatabaseORMStatementReturn]):
     """
     Asynchronous database ORM `select` statement type.
 

{reydb-1.2.10.dist-info → reydb-1.2.12.dist-info}/METADATA

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

{reydb-1.2.10.dist-info → reydb-1.2.12.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=0jI0MNl-BIhQtuT_-GeXBPTjG76k9EE3wwEQXGhTJyc,80938
-reydb/rconfig.py,sha256=xoujEyZzkB9UwG8lkZBDBmeUOEo8Sr1Oktveos-EWWc,19168
+reydb/rconfig.py,sha256=9tMDKivwju08kIAl7CahOMdvmuuO1Q_4I_JhMPWUbvg,19319
 reydb/rconn.py,sha256=guRaR8N6RuzZzujwaeq7HhKWTizF9SrUBqEAFjfjpoo,6909
 reydb/rdb.py,sha256=syyqZbEu92NbCj9O6_T6iAv7E46CyfQOC4T8qtPfHNs,14364
 reydb/rerror.py,sha256=uwVuolRp-PmXXUZIA_Qd2S6NSOm1S0vDJvehX6l__U8,14888
-reydb/rexec.py,sha256=djHx311c6mr1IjzNLqnGe-4yr3qNmYGUy4pHQA3WElQ,53042
+reydb/rexec.py,sha256=u6ZU5dljUktICvJFhUIzg3U7ME9fhICL3NyqZugz5H4,53010
 reydb/rinfo.py,sha256=LjrqTA7JJbWJsjXwV-zKpbE1htv-whg6239hoQj4yIU,18151
-reydb/rorm.py,sha256=kVe2PtF7pYy6zws8c9qBDYkY2ZmGoiHcio1wN_3LmEk,44244
-reydb-1.2.10.dist-info/METADATA,sha256=Egt0VRbjmWTbVl-MwSs7qNrLDKGGvRMYYNJ3xtrUmQ4,1622
-reydb-1.2.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.10.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.10.dist-info/RECORD,,
+reydb/rorm.py,sha256=VkldNaXpTz-lGhrz-8CDuBWxnDY9uBbZphsP1Jpe84E,45188
+reydb-1.2.12.dist-info/METADATA,sha256=hE9zm7viJ_8CcZPI4NTZfGWqMn9AHQvvFtpmHEzCAbA,1622
+reydb-1.2.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.12.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.12.dist-info/RECORD,,