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

reydb/__init__.py

@@ -19,5 +19,6 @@ rerror : Database error methods.
 rexec : Database execute methods.
 rfile : Database file methods.
 rinfo : Database information methods.
+rorm : Database ORM methods.
 rparam : Database parameter methods.
 """

reydb/rall.py

@@ -18,4 +18,5 @@ from .rerror import *
 from .rexec import *
 from .rfile import *
 from .rinfo import *
+from .rorm import *
 from .rparam import *

reydb/rbase.py

@@ -9,9 +9,10 @@
 """
 
 
-from typing import Any, TypedDict, Literal
+from typing import Any, TypedDict, Literal, overload
 from sqlalchemy.engine.base import Engine, Connection
 from sqlalchemy.engine.url import URL
+from sqlalchemy.sql.elements import TextClause
 from reykit.rbase import Base, throw
 from reykit.rre import search
 
@@ -19,7 +20,8 @@ from reykit.rre import search
 __all__ = (
     'DatabaseBase',
     'extract_url',
-    'extract_engine'
+    'extract_engine',
+    'extract_path'
 )
 
 
@@ -187,3 +189,100 @@ def extract_engine(engine: Engine | Connection) -> dict[
     }
 
     return params
+
+
+def extract_path(
+    path: str | tuple[str] | tuple[str, str] | tuple[str, str, str]
+) -> tuple[str, str | None, str | None]:
+    """
+    Extract table name and database name and column name from path.
+
+    Parameters
+    ----------
+    path : Path.
+        - `str` and not contain '.' or contain '`': Database name.
+        - `str` and contain '.': Database name and table name, column name is optional. Format is 'database.table[.column]'.
+        - `tuple`: Format is `(database[, table, column])`.
+
+    Returns
+    -------
+    Names.
+    """
+
+    # Type str.
+    if type(path) == str:
+
+        ## Single.
+        if (
+            '.' not in path
+            or '`' in path
+        ):
+            name = path.replace('`', '')
+            names = (name, None, None)
+
+        ## Multiple.
+        else:
+            names = path.split('.', 2)
+            if len(names) == 2:
+                names.append(None)
+            names = tuple(names)
+
+    # Type tuple.
+    else:
+        if len(path) == 1:
+            path += (None, None)
+        if len(path) == 2:
+            path += (None,)
+        names = path
+
+    return names
+
+
+def get_syntax(self, sql: str | TextClause) -> list[str]:
+    """
+    Extract SQL syntax type for each segment form SQL.
+
+    Parameters
+    ----------
+    sql : SQL text or TextClause object.
+
+    Returns
+    -------
+    SQL syntax type for each segment.
+    """
+
+    # Handle parameter.
+    if type(sql) == TextClause:
+        sql = sql.text
+
+    # Extract.
+    syntax = [
+        search('[a-zA-Z]+', sql_part).upper()
+        for sql_part in sql.split(';')
+        if sql_part != ''
+    ]
+
+    return syntax
+
+
+def is_multi_sql(self, sql: str | TextClause) -> bool:
+    """
+    Judge whether it is multi segment SQL.
+
+    Parameters
+    ----------
+    sql : SQL text or TextClause object.
+
+    Returns
+    -------
+    Judgment result.
+    """
+
+    # Handle parameter.
+    if type(sql) == TextClause:
+        sql = sql.text
+
+    # Judge.
+    if ';' in sql.rstrip()[:-1]:
+        return True
+    return False

reydb/rbuild.py

@@ -14,8 +14,7 @@ from copy import deepcopy
 from reykit.rbase import throw
 from reykit.rstdout import ask
 
-from .rbase import DatabaseBase
-from .rconn import DatabaseConnection
+from .rbase import DatabaseBase, extract_path
 from .rdb import Database
 
 
@@ -52,22 +51,17 @@ class DatabaseBuild(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.
         """
 
-        # SQLite.
-        if database.backend == 'sqlite':
-            text = 'not suitable for SQLite databases'
-            throw(AssertionError, text=text)
-
         # Set attribute.
-        self.database = database
+        self.db = db
         self._schema: dict[str, dict[str, list[str]]] | None = None
 
 
@@ -98,7 +92,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -285,7 +279,8 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.database.extract_path(path)
+        if type(path) == str:
+            database, table, _ = extract_path(path)
         if fields.__class__ == dict:
             fields = [fields]
         if primary.__class__ == str:
@@ -347,7 +342,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -375,7 +370,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, view, _ = self.database.extract_path(path)
+        database, view, _ = extract_path(path)
 
         # Generate SQL.
         select = select.replace('\n', '\n    ')
@@ -383,7 +378,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -476,7 +471,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -502,14 +497,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.database.extract_path(path)
+        database, table, _ = extract_path(path)
 
         # Generate.
         sql = f'DROP TABLE `{database}`.`{table}`'
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -535,14 +530,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, view, _ = self.database.extract_path(path)
+        database, view, _ = extract_path(path)
 
         # Generate SQL.
         sql = 'DROP VIEW `%s`.`%s`' % (database, view)
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -592,7 +587,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -649,7 +644,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.database.extract_path(path)
+        database, table, _ = extract_path(path)
         if fields.__class__ == dict:
             fields = [fields]
         if primary.__class__ == str:
@@ -707,7 +702,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -739,7 +734,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.database.extract_path(path)
+        database, table, _ = extract_path(path)
         if fields.__class__ == str:
             fields = [fields]
         if indexes.__class__ == str:
@@ -778,7 +773,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -829,7 +824,7 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.database.extract_path(path)
+        database, table, _ = extract_path(path)
         if fields.__class__ == dict:
             fields = [fields]
 
@@ -897,7 +892,7 @@ class DatabaseBuild(DatabaseBase):
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -925,14 +920,14 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, view, _ = self.database.extract_path(path)
+        database, view, _ = extract_path(path)
 
         # Generate SQL.
         sql = 'ALTER VIEW `%s`.`%s` AS\n%s' % (database, view, select)
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
@@ -958,21 +953,21 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, _ = self.database.extract_path(path)
+        database, table, _ = extract_path(path)
 
         # Generate.
         sql = f'TRUNCATE TABLE `{database}`.`{table}`'
 
         # Execute.
         if execute:
-            self.database.execute(sql)
+            self.db.execute(sql)
 
         return sql
 
 
     def exist(
         self,
-        path: str | tuple[str, str | None, str | None]
+        path: str | tuple[str] | tuple[str, str] | tuple[str, str, str]
     ) -> bool:
         """
         Judge database or table or column exists.
@@ -981,7 +976,7 @@ class DatabaseBuild(DatabaseBase):
         ----------
         path : Database name and table name and column name.
             - `str`: Automatic extract.
-            - `tuple[str, str | None, str | None]`: Database name, table name and column name is optional.
+            - `tuple`: Format is `(database[, table, column]).`
 
         Returns
         -------
@@ -989,9 +984,9 @@ class DatabaseBuild(DatabaseBase):
         """
 
         # Handle parameter.
-        database, table, column = self.database.extract_path(path, 'database')
+        database, table, column = extract_path(path)
         if self._schema is None:
-            self._schema = self.database.schema(False)
+            self._schema = self.db.schema(False)
 
         # Judge.
         judge = (
@@ -1081,7 +1076,7 @@ class DatabaseBuild(DatabaseBase):
             database = params['name']
 
             ## Exist.
-            exist = self.database.build.exist((database, None, None))
+            exist = self.db.build.exist((database, None, None))
             if exist:
                 continue
 
@@ -1092,7 +1087,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"Database '{database}' build completed."
@@ -1101,10 +1096,10 @@ class DatabaseBuild(DatabaseBase):
         # Table.
         for params in tables:
             path = params['path']
-            database, table, _ = self.database.extract_path(path)
+            database, table, _ = extract_path(path)
 
             ## Exist.
-            exist = self.database.build.exist((database, table, None))
+            exist = self.db.build.exist((database, table, None))
             if exist:
                 continue
 
@@ -1115,7 +1110,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"Table '{table}' of database '{database}' build completed."
@@ -1124,10 +1119,10 @@ class DatabaseBuild(DatabaseBase):
         # View.
         for params in views:
             path = params['path']
-            database, view, _ = self.database.extract_path(path)
+            database, view, _ = extract_path(path)
 
             ## Exist.
-            exist = self.database.build.exist((database, view, None))
+            exist = self.db.build.exist((database, view, None))
             if exist:
                 continue
 
@@ -1138,7 +1133,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"View '{view}' of database '{database}' build completed."
@@ -1147,10 +1142,10 @@ class DatabaseBuild(DatabaseBase):
         # View stats.
         for params in views_stats:
             path = params['path']
-            database, view, _ = self.database.extract_path(path)
+            database, view, _ = extract_path(path)
 
             ## Exist.
-            exist = self.database.build.exist((database, view, None))
+            exist = self.db.build.exist((database, view, None))
             if exist:
                 continue
 
@@ -1161,7 +1156,7 @@ class DatabaseBuild(DatabaseBase):
             self.input_confirm_build(sql)
 
             ## Execute.
-            self.database.execute(sql)
+            self.db.execute(sql)
 
             ## Report.
             text = f"View '{view}' of database '{database}' build completed."

reydb/rconfig.py

@@ -19,7 +19,6 @@ from datetime import (
 )
 from reykit.rbase import null, throw
 
-from .rconn import DatabaseConnection
 from .rdb import Database
 
 
@@ -49,18 +48,17 @@ class DatabaseConfig(object):
     """
 
 
-    def __init__(self, database: Database | DatabaseConnection) -> None:
+    def __init__(self, db: Database) -> None:
         """
         Build instance attributes.
-        """
 
-        # SQLite.
-        if database.backend == 'sqlite':
-            text = 'not suitable for SQLite databases'
-            throw(AssertionError, text=text)
+        Parameters
+        ----------
+        db: Database instance.
+        """
 
         # Build.
-        self.database = database
+        self.db = db
 
         ## Database path name.
         self.db_names = {
@@ -185,7 +183,7 @@ class DatabaseConfig(object):
         ]
 
         # Build.
-        self.database.build.build(databases, tables, views_stats=views_stats)
+        self.db.build.build(databases, tables, views_stats=views_stats)
 
 
     @property
@@ -199,7 +197,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute_select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             ['key', 'value', 'type', 'note'],
             order='IFNULL(`update_time`, `create_time`) DESC'
@@ -235,7 +233,7 @@ class DatabaseConfig(object):
 
         # Get.
         where = '`key` = :key'
-        result = self.database.execute_select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             '`value`',
             where,
@@ -281,7 +279,7 @@ class DatabaseConfig(object):
             'type': type(default).__name__,
             'note': default_note
         }
-        result = self.database.execute_insert(
+        result = self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.config']),
             data,
             'ignore'
@@ -322,7 +320,7 @@ class DatabaseConfig(object):
                 row['type'] = type(row['value']).__name__
 
         # Update.
-        self.database.execute_insert(
+        self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.config']),
             data,
             'update'
@@ -345,7 +343,7 @@ class DatabaseConfig(object):
         else:
             where = '`key` in :key'
             limit = None
-        result = self.database.execute_delete(
+        result = self.db.execute.delete(
             (self.db_names['base'], self.db_names['base.config']),
             where,
             limit=limit,
@@ -367,7 +365,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute_select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             ['key', 'value']
         )
@@ -393,7 +391,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute_select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             '`key`'
         )
@@ -418,7 +416,7 @@ class DatabaseConfig(object):
         """
 
         # Get.
-        result = self.database.execute_select(
+        result = self.db.execute.select(
             (self.db_names['base'], self.db_names['base.config']),
             '`value`'
         )
@@ -480,7 +478,7 @@ class DatabaseConfig(object):
             'type': type(value).__name__,
             'note': note
         }
-        self.database.execute_insert(
+        self.db.execute.insert(
             (self.db_names['base'], self.db_names['base.config']),
             data,
             'update'

reydb/rconn.py

@@ -10,10 +10,9 @@
 
 
 from typing import Self
-from sqlalchemy.engine.base import Connection
-from sqlalchemy.sql.elements import TextClause
 
-from .rdb import Result, Database
+from .rbase import DatabaseBase
+from .rdb import Database
 
 
 __all__ = (
@@ -21,7 +20,7 @@ __all__ = (
 )
 
 
-class DatabaseConnection(Database):
+class DatabaseConnection(DatabaseBase):
     """
     Database connection type.
     """
@@ -29,66 +28,46 @@ class DatabaseConnection(Database):
 
     def __init__(
         self,
-        connection: Connection,
-        rdatabase: Database
+        db: Database,
+        autocommit: bool
     ) -> None:
         """
         Build instance attributes.
 
         Parameters
         ----------
-        connection : Connection object.
-        rdatabase : Database object.
+        db : Database instance.
+        autocommit: Whether automatic commit connection.
         """
 
-        # Set parameter.
-        self.connection = connection
-        self.rdatabase = rdatabase
+        # Build.
+        self.db = db
+        self.autocommit = autocommit
+        self.conn = db.engine.connect()
         self.begin = None
-        self.username = rdatabase.username
-        self.password = rdatabase.password
-        self.host = rdatabase.host
-        self.port = rdatabase.port
-        self.database = rdatabase.database
-        self.query = rdatabase.query
-        self.pool_recycle = rdatabase.pool_recycle
 
 
-    def executor(
-        self,
-        sql: TextClause,
-        data: list[dict],
-        report: bool
-    ) -> Result:
+    @property
+    def execute(self):
         """
-        SQL executor.
-
-        Parameters
-        ----------
-        sql : TextClause object.
-        data : Data set for filling.
-        report : Whether report SQL execute information.
+        Build `database execute` instance.
 
         Returns
         -------
-        Result object.
+        Instance.
         """
 
+        # Import.
+        from .rexec import DatabaseExecute
+
         # Create transaction.
         if self.begin is None:
-            self.begin = self.connection.begin()
-
-        # Execute.
+            self.begin = self.conn.begin()
 
-        ## Report.
-        if report:
-            result = self.executor_report(self.connection, sql, data)
-
-        ## Not report.
-        else:
-            result = self.connection.execute(sql, data)
+        # Build.
+        exec = DatabaseExecute(self)
 
-        return result
+        return exec
 
 
     def commit(self) -> None:
@@ -119,7 +98,7 @@ class DatabaseConnection(Database):
         """
 
         # Close.
-        self.connection.close()
+        self.conn.close()
 
 
     def __enter__(self) -> Self: