reydb 1.1.48__py3-none-any.whl → 1.1.50__py3-none-any.whl

reydb/rfile.py

@@ -11,11 +11,9 @@
 
 from typing import TypedDict, overload
 from datetime import datetime
-from reykit.rbase import throw
 from reykit.ros import File, Folder, get_md5
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -34,22 +32,17 @@ class DatabaseFile(DatabaseBase):
     """
 
 
-    def __init__(self, database: Database | DatabaseConnection) -> None:
+    def __init__(self, db: Database) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        database : Database or DatabaseConnection instance.
+        db: Database instance.
         """
 
-        # Check.
-        if database.backend == 'sqlite':
-            text = 'not suitable for SQLite databases'
-            throw(AssertionError, text=text)
-
         # Build.
-        self.database = database
+        self.db = db
 
         ## Database path name.
         self.db_names = {
@@ -279,7 +272,7 @@ class DatabaseFile(DatabaseBase):
         ]
 
         # Build.
-        self.database.build.build(databases, tables, views, views_stats)
+        self.db.build.build(databases, tables, views, views_stats)
 
 
     def upload(
@@ -307,7 +300,7 @@ class DatabaseFile(DatabaseBase):
         """
 
         # Handle parameter.
-        conn = self.database.connect()
+        conn = self.db.connect()
         match source:
 
             ## File path.
@@ -333,7 +326,7 @@ class DatabaseFile(DatabaseBase):
         file_size = len(file_bytes)
 
         # Exist.
-        exist = conn.execute_exist(
+        exist = conn.execute.exist(
             (self.db_names['file'], self.db_names['file.data']),
             '`md5` = :file_md5',
             file_md5=file_md5
@@ -348,7 +341,7 @@ class DatabaseFile(DatabaseBase):
                 'size': file_size,
                 'bytes': file_bytes
             }
-            conn.execute_insert(
+            conn.execute.insert(
                 (self.db_names['file'], self.db_names['file.data']),
                 data,
                 'ignore'
@@ -360,7 +353,7 @@ class DatabaseFile(DatabaseBase):
             'name': file_name,
             'note': note
         }
-        conn.execute_insert(
+        conn.execute.insert(
             (self.db_names['file'], self.db_names['file.information']),
             data
         )
@@ -424,7 +417,7 @@ class DatabaseFile(DatabaseBase):
         )
 
         # Execute SQL.
-        result = self.database.execute(sql, file_id=file_id)
+        result = self.db.execute(sql, file_id=file_id)
 
         # Check.
         if result.empty:
@@ -476,7 +469,7 @@ class DatabaseFile(DatabaseBase):
         )
 
         # Execute SQL.
-        result = self.database.execute(sql, file_id=file_id)
+        result = self.db.execute(sql, file_id=file_id)
 
         # Check.
         if result.empty:

reydb/rinfo.py

@@ -11,10 +11,8 @@
 
 from __future__ import annotations
 from typing import Any, Literal, overload
-from reykit.rbase import throw
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -151,11 +149,11 @@ class DatabaseInformation(DatabaseBase):
         # Build.
         match self:
             case DatabaseInformationSchema():
-                table = DatabaseInformationDatabase(self._rdatabase, name)
+                table = DatabaseInformationDatabase(self.db, name)
             case DatabaseInformationDatabase():
-                table = DatabaseInformationTable(self._rdatabase, self._database_name, name)
+                table = DatabaseInformationTable(self.db, self.database, name)
             case DatabaseInformationTable():
-                table = DatabaseInformationColumn(self._rdatabase, self._database_name, self._table_name, name)
+                table = DatabaseInformationColumn(self.db, self.database, self.table, name)
             case _:
                 raise AssertionError("class '%s' does not have this method" % type(self).__name__)
 
@@ -193,18 +191,18 @@ class DatabaseInformationSchema(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection
+        db: Database
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        db: Database instance.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
+        self.db = db
 
 
     def _get_info_table(self) -> list[dict]:
@@ -216,16 +214,11 @@ class DatabaseInformationSchema(DatabaseInformation):
         Information table.
         """
 
-        # SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            throw(AssertionError, self._rdatabase.drivername)
-
         # Select.
-        else:
-            result = self._rdatabase.execute_select(
-                'information_schema.SCHEMATA',
-                order='`schema_name`'
-            )
+        result = self.db.execute.select(
+            'information_schema.SCHEMATA',
+            order='`schema_name`'
+        )
 
         # Convert.
         info_table = result.to_table()
@@ -261,28 +254,21 @@ class DatabaseInformationDatabase(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
-        database_name: str
+        db: Database,
+        database: str
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
-        database_name : Database name.
+        db: Database instance.
+        database : Database name.
         """
 
-        # SQLite.
-        if (
-            rdatabase.backend == 'sqlite'
-            and database_name != 'main'
-        ):
-            throw(ValueError, database_name)
-
         # Set parameter.
-        self._rdatabase = rdatabase
-        self._database_name = database_name
+        self.db = db
+        self.database = database
 
 
     def _get_info_attrs(self) -> dict:
@@ -294,24 +280,20 @@ class DatabaseInformationDatabase(DatabaseInformation):
         Information attribute dictionary.
         """
 
-        # SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            throw(AssertionError, self._rdatabase.drivername)
-
         # Select.
-        where = '`SCHEMA_NAME` = :database_name'
-        result = self._rdatabase.execute_select(
+        where = '`SCHEMA_NAME` = :database'
+        result = self.db.execute.select(
             'information_schema.SCHEMATA',
             where=where,
             limit=1,
-            database_name=self._database_name
+            database=self.database
         )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' not exist" % self._database_name
+        assert len(info_table) != 0, "database '%s' not exist" % self.database
 
         info_attrs = info_table[0]
 
@@ -328,26 +310,19 @@ class DatabaseInformationDatabase(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            result = self._rdatabase.execute_select('main.sqlite_master')
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.TABLES',
-                where=where,
-                order='`TABLE_NAME`',
-                database_name=self._database_name
-            )
+        where = '`TABLE_SCHEMA` = :database'
+        result = self.db.execute.select(
+            'information_schema.TABLES',
+            where=where,
+            order='`TABLE_NAME`',
+            database=self.database
+        )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' not exist" % self._database_name
+        assert len(info_table) != 0, "database '%s' not exist" % self.database
 
         return info_table
 
@@ -374,24 +349,24 @@ class DatabaseInformationTable(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
-        database_name: str,
-        table_name: str
+        db: Database,
+        database: str,
+        table: str
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
-        database_name : Database name.
-        table_name : Table name.
+        db: Database instance.
+        database : Database name.
+        table : Table name.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
-        self._database_name = database_name
-        self._table_name = table_name
+        self.db = db
+        self.database = database
+        self.table = table
 
 
     def _get_info_attrs(self) -> dict:
@@ -404,33 +379,20 @@ class DatabaseInformationTable(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            where = '`name` = :name'
-            result = self._rdatabase.execute_select(
-                'main.sqlite_master',
-                where=where,
-                limit=1,
-                name=self._table_name
-            )
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.TABLES',
-                where=where,
-                limit=1,
-                database_name=self._database_name,
-                table_name=self._table_name
-            )
+        where = '`TABLE_SCHEMA` = :database AND `TABLE_NAME` = :table_'
+        result = self.db.execute.select(
+            'information_schema.TABLES',
+            where=where,
+            limit=1,
+            database=self.database,
+            table_=self.table
+        )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self._database_name, self._table_name)
+        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self.database, self.table)
 
         info_attrs = info_table[0]
 
@@ -447,28 +409,20 @@ class DatabaseInformationTable(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            sql = f'PRAGMA table_info("%s")' % self._table_name
-            result = self._rdatabase.execute(sql)
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.COLUMNS',
-                where=where,
-                order='`ORDINAL_POSITION`',
-                database_name=self._database_name,
-                table_name=self._table_name
-            )
+        where = '`TABLE_SCHEMA` = :database AND `TABLE_NAME` = :table_'
+        result = self.db.execute.select(
+            'information_schema.COLUMNS',
+            where=where,
+            order='`ORDINAL_POSITION`',
+            database=self.database,
+            table_=self.table
+        )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self._database_name, self._table_name)
+        assert len(info_table) != 0, "database '%s' or table '%s' not exist" % (self.database, self.table)
 
         return info_table
 
@@ -489,27 +443,27 @@ class DatabaseInformationColumn(DatabaseInformation):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
-        database_name: str,
-        table_name: str,
-        column_name: str
+        db: Database,
+        database: str,
+        table: str,
+        column: str
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
-        database_name : Database name.
-        table_name : Table name.
-        column_name : Column name.
+        db: Database instance.
+        database : Database name.
+        table : Table name.
+        column : Column name.
         """
 
         # Set parameter.
-        self._rdatabase = rdatabase
-        self._database_name = database_name
-        self._table_name = table_name
-        self._column_name = column_name
+        self.db = db
+        self.database = database
+        self.table = table
+        self.column = column
 
 
     def _get_info_attrs(self) -> dict:
@@ -522,35 +476,21 @@ class DatabaseInformationColumn(DatabaseInformation):
         """
 
         # Select.
-
-        ## SQLite.
-        if self._rdatabase.backend == 'sqlite':
-            sql = f'PRAGMA table_info("%s")' % self._table_name
-            where = '`name` = :name'
-            result = self._rdatabase.execute(
-                sql,
-                where=where,
-                limit=1,
-                name=self._column_name
-            )
-
-        ## Other.
-        else:
-            where = '`TABLE_SCHEMA` = :database_name AND `TABLE_NAME` = :table_name AND `COLUMN_NAME` = :column_name'
-            result = self._rdatabase.execute_select(
-                'information_schema.COLUMNS',
-                where=where,
-                limit=1,
-                database_name=self._database_name,
-                table_name=self._table_name,
-                column_name=self._column_name
-            )
+        where = '`TABLE_SCHEMA` = :database AND `TABLE_NAME` = :table_ AND `COLUMN_NAME` = :column'
+        result = self.db.execute.select(
+            'information_schema.COLUMNS',
+            where=where,
+            limit=1,
+            database=self.database,
+            table_=self.table,
+            column=self.column
+        )
 
         # Convert.
         info_table = result.to_table()
 
         ## Check.
-        assert len(info_table) != 0, "database '%s' or table '%s' or column '%s' not exist" % (self._database_name, self._table_name, self._column_name)
+        assert len(info_table) != 0, "database '%s' or table '%s' or column '%s' not exist" % (self.database, self.table, self.column)
 
         info_attrs = info_table[0]
 

reydb/rorm.py

@@ -0,0 +1,39 @@
+# !/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+@Time    : 2025-09-23 00:50:32
+@Author  : Rey
+@Contact : reyxbo@163.com
+@Explain : Database ORM methods.
+"""
+
+
+from sqlmodel import SQLModel, Session
+
+from .rbase import DatabaseBase
+from .rdb import Database
+
+
+__all__ = (
+    'DatabaseORM',
+)
+
+
+class DatabaseORM(DatabaseBase):
+    """
+    Database ORM type.
+    """
+
+
+    def __init__(self, db: Database) -> None:
+        """
+        Build instance attributes.
+
+        Parameters
+        ----------
+        db: Database instance.
+        """
+
+        # Build.
+        self.db = db

reydb/rparam.py

@@ -12,7 +12,6 @@
 from typing import overload
 
 from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -32,7 +31,7 @@ class DatabaseParameters(DatabaseBase):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection,
+        db: Database,
         global_: bool
     ) -> None:
         """
@@ -40,12 +39,12 @@ class DatabaseParameters(DatabaseBase):
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        db: Database instance.
         global\\_ : Whether base global.
         """
 
         # Set parameter.
-        self.rdatabase = rdatabase
+        self.db = db
         self.global_ = global_
 
 
@@ -126,13 +125,13 @@ class DatabaseParametersStatus(DatabaseParameters):
 
         ## Dictionary.
         if key is None:
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             status = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             row = result.first()
             if row is None:
                 status = None
@@ -196,13 +195,13 @@ class DatabaseParametersVariable(DatabaseParameters):
 
         ## Dictionary.
         if key is None:
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             variables = result.to_dict(val_field=1)
 
         ## Value.
         else:
             sql += ' LIKE :key'
-            result = self.rdatabase.execute(sql, key=key)
+            result = self.db.execute(sql, key=key)
             row = result.first()
             if row is None:
                 variables = None
@@ -244,7 +243,7 @@ class DatabaseParametersVariable(DatabaseParameters):
             sql = f'SET {sql_set}'
 
         # Execute SQL.
-        self.rdatabase.execute(sql)
+        self.db.execute(sql)
 
 
 class DatabaseParametersPragma(DatabaseParameters):
@@ -255,18 +254,18 @@ class DatabaseParametersPragma(DatabaseParameters):
 
     def __init__(
         self,
-        rdatabase: Database | DatabaseConnection
+        db: Database
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        rdatabase : Database or DatabaseConnection instance.
+        db: Database instance.
         """
 
         # Set parameter.
-        self.rdatabase = rdatabase
+        self.db = db
 
 
     def get(self, key: str) -> str | None:
@@ -286,7 +285,7 @@ class DatabaseParametersPragma(DatabaseParameters):
         sql = f'PRAGMA %s' % key
 
         # Execute SQL.
-        result = self.rdatabase.execute(sql)
+        result = self.db.execute(sql)
         row = result.first()
         if row is None:
             variables = None
@@ -320,4 +319,4 @@ class DatabaseParametersPragma(DatabaseParameters):
         sql = ';\n'.join(sql_set_list)
 
         # Execute SQL.
-        self.rdatabase.execute(sql)
+        self.db.execute(sql)

{reydb-1.1.48.dist-info → reydb-1.1.50.dist-info}/METADATA

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

reydb-1.1.50.dist-info/RECORD

@@ -0,0 +1,17 @@
+reydb/__init__.py,sha256=vwShFPkCDpLTrVGCq1AZgKCGQ8tBBodCxrvrib9ptrs,574
+reydb/rall.py,sha256=GsXHqvT1k--U53HpDY4SALjIHN8rwgSxeXpJjH5gq2E,409
+reydb/rbase.py,sha256=A7or663TcrQyq56P813WsV4BlApZIzXOPdZLsT7KwWw,7040
+reydb/rbuild.py,sha256=8sYuqYR3jKlPfIrCwXk9o-q8cx-VNU0XsIsA6XKIKPo,31850
+reydb/rconfig.py,sha256=4vT0kKVdb9hJjHPQGtmvenPPRbtR1EP2k7jCgfPR0s8,12657
+reydb/rconn.py,sha256=IGRiOkk0TzWj-NQ2o6A1FnMqYnDvg2G1Dd-7cA0dpP0,2765
+reydb/rdb.py,sha256=Ijxja3lb73YmJfzpJBT3bQrqz9rV3TC5w2shQfwj0gQ,12919
+reydb/rerror.py,sha256=TBAzMsf7BrmelhXr5hbqOYVmmRFQtFkyC2SZQx81oYA,9941
+reydb/rexec.py,sha256=xIUbTULfmMkLBYZTPX6lyN5yob-eg6M7Xir1j3jf6PM,29071
+reydb/rfile.py,sha256=k5y3U179NED3gWdyZQ_JRuHmzFTKsZ8aMhxg04ENuHg,15180
+reydb/rinfo.py,sha256=aM3mMFwgT9pemrusS_YjXAVUCJOJ3V709bEWuB-fkuc,12737
+reydb/rorm.py,sha256=ZdXPCeflshlg-ABFpEAI7UFJWdqdBYbbi5yrCAE8Fo8,625
+reydb/rparam.py,sha256=M_tT8nesAResxoDVhk8cmG2N5woYMxXinSGIC2i_8ak,6799
+reydb-1.1.50.dist-info/METADATA,sha256=JtY5fp1zwawCi2KPhLqytLCK_ze6ZxgJ91r5fjIKmmc,1550
+reydb-1.1.50.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.50.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.50.dist-info/RECORD,,

reydb-1.1.48.dist-info/RECORD

@@ -1,16 +0,0 @@
-reydb/__init__.py,sha256=SqjJEBMiUMnKkNfmOvw_jprZcj9Edi0jyBKt67xeYUE,544
-reydb/rall.py,sha256=UWnbtl4oG4YqXyqTMN_5uqE-QqD5nb_-dvarotlTUeU,388
-reydb/rbase.py,sha256=HYoFasGBAhXUUHNFP1doGnHBW3-xkgRc32O9KppGSak,4824
-reydb/rbuild.py,sha256=iXJ76BNlUflJfMAAEbPuQLyVePyye8aDq7MaXD16Ktw,32419
-reydb/rconfig.py,sha256=akY9zDQ7chmA5Hkf7Q7F_Oqqjn6gDk9B88dyLQEYMak,12886
-reydb/rconn.py,sha256=UyYx-134b8KwlhBl3D3y5PdXrGceL3n9Oc7bk8xWek0,3475
-reydb/rdb.py,sha256=iThWa2afN0NUkrcsp4_JXGJwPsyp6Xu-l3Qsl5xxaeY,54288
-reydb/rerror.py,sha256=UFz9RnuQX83Ki-fAv9ihrRorVMKlUbawaxAwhnS-dVw,10232
-reydb/rexec.py,sha256=dGdRkG1XR0Z66T0r4nPCSdQzSRWc_Q3t6TPSSrDTIxY,9042
-reydb/rfile.py,sha256=CeRMdAyVEPrHEYfYb1cPubLn5EWYEHkqezyaEZ1fif8,15507
-reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
-reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
-reydb-1.1.48.dist-info/METADATA,sha256=8zJUpAS0pGVWu_72FQstiWP96_dtTr3a34kb7XS-5kQ,1550
-reydb-1.1.48.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.48.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.48.dist-info/RECORD,,