reydb 1.1.44__py3-none-any.whl → 1.1.46__py3-none-any.whl

reydb/rconn.py

@@ -9,15 +9,9 @@
 """
 
 
-from typing import Any, Self
+from typing import Self
 from sqlalchemy.engine.base import Connection
 from sqlalchemy.sql.elements import TextClause
-from sqlalchemy.exc import OperationalError
-from reykit.rbase import get_first_notnone
-from reykit.rdata import objs_in
-from reykit.rstdout import echo
-from reykit.rtable import TableData, Table
-from reykit.rwrap import wrap_runtime, wrap_retry
 
 from .rdb import Result, Database
 
@@ -51,7 +45,6 @@ class DatabaseConnection(Database):
         self.connection = connection
         self.rdatabase = rdatabase
         self.begin = None
-        self.begin_count = 0
         self.username = rdatabase.username
         self.password = rdatabase.password
         self.host = rdatabase.host
@@ -59,12 +52,10 @@ class DatabaseConnection(Database):
         self.database = rdatabase.database
         self.query = rdatabase.query
         self.pool_recycle = rdatabase.pool_recycle
-        self.retry = rdatabase.retry
 
 
     def executor(
         self,
-        connection: Connection,
         sql: TextClause,
         data: list[dict],
         report: bool
@@ -74,7 +65,6 @@ class DatabaseConnection(Database):
 
         Parameters
         ----------
-        connection : Connection object.
         sql : TextClause object.
         data : Data set for filling.
         report : Whether report SQL execute information.
@@ -84,101 +74,19 @@ class DatabaseConnection(Database):
         Result object.
         """
 
-        # Create Transaction object.
-        if self.begin_count == 0:
-            self.rollback()
-            self.begin = connection.begin()
+        # Create transaction.
+        if self.begin is None:
+            self.begin = self.connection.begin()
 
         # Execute.
 
         ## Report.
         if report:
-            execute = wrap_runtime(connection.execute, to_return=True)
-            result, report_runtime, *_ = execute(sql, data)
-            report_info = (
-                f'{report_runtime}\n'
-                f'Row Count: {result.rowcount}'
-            )
-            sqls = [
-                sql_part.strip()
-                for sql_part in sql.text.split(';')
-                if sql_part != ''
-            ]
-            if data == []:
-                echo(report_info, *sqls, title='SQL')
-            else:
-                echo(report_info, *sqls, data, title='SQL')
+            result = self.executor_report(self.connection, sql, data)
 
         ## Not report.
         else:
-            result = connection.execute(sql, data)
-
-        # Count.
-        syntaxes = self.get_syntax(sql)
-        if objs_in(syntaxes, 'INSERT', 'UPDATE', 'DELETE'):
-            self.begin_count += 1
-
-        return result
-
-
-    def execute(
-        self,
-        sql: str | TextClause,
-        data: TableData | None = None,
-        report: bool | None = None,
-        **kwdata: Any
-    ) -> Result:
-        """
-        Execute SQL.
-
-        Parameters
-        ----------
-        sql : SQL in method `sqlalchemy.text` format, or `TextClause` object.
-        data : Data set for filling.
-        report : Whether report SQL execute information.
-            - `None`: Use attribute `default_report`.
-            - `bool`: Use this value.
-        kwdata : Keyword parameters for filling.
-
-        Returns
-        -------
-        Result object.
-        """
-
-        # Handle parameter by priority.
-        report = get_first_notnone(report, self.default_report)
-
-        # Handle parameter.
-        sql = self.handle_sql(sql)
-        if data is None:
-            if kwdata == {}:
-                data = []
-            else:
-                data = [kwdata]
-        else:
-            data_table = Table(data)
-            data = data_table.to_table()
-            for row in data:
-                row.update(kwdata)
-        data = self.handle_data(data, sql)
-
-        # Execute.
-
-        ## Can retry.
-        if (
-            self.retry
-            and self.begin_count == 0
-            and not self.is_multi_sql(sql)
-        ):
-            text = 'Retrying...'
-            title = 'Database Execute Operational Error'
-            handler = lambda exc_text, *_: echo(exc_text, text, title=title, frame='top')
-            executor = wrap_retry(self.executor, handler=handler, exception=OperationalError)
-            result = executor(self.connection, sql, data, report)
-
-        ## Cannot retry.
-        else:
-            result = self.executor(self.connection, sql, data, report)
+            result = self.connection.execute(sql, data)
 
         return result
 
@@ -192,7 +100,6 @@ class DatabaseConnection(Database):
         if self.begin is not None:
             self.begin.commit()
             self.begin = None
-            self.begin_count = 0
 
 
     def rollback(self) -> None:
@@ -204,7 +111,6 @@ class DatabaseConnection(Database):
         if self.begin is not None:
             self.begin.rollback()
             self.begin = None
-            self.begin_count = 0
 
 
     def close(self) -> None:

reydb/rdb.py

@@ -17,15 +17,14 @@ from pymysql.constants.CLIENT import MULTI_STATEMENTS
 from sqlalchemy import create_engine as sqlalchemy_create_engine, text as sqlalchemy_text
 from sqlalchemy.engine.base import Engine, Connection
 from sqlalchemy.sql.elements import TextClause
-from sqlalchemy.exc import OperationalError
-from reykit.rbase import throw, is_iterable, get_first_notnone
+from reykit.rbase import throw, get_first_notnone
 from reykit.rdata import Generator, to_json
 from reykit.rmonkey import monkey_sqlalchemy_result_more_fetch, monkey_sqlalchemy_row_index_field
 from reykit.rre import search, findall
 from reykit.rstdout import echo
 from reykit.rtable import TableData, Table
 from reykit.rtext import join_data_text
-from reykit.rwrap import wrap_runtime, wrap_retry
+from reykit.rwrap import wrap_runtime
 
 from .rbase import DatabaseBase, extract_url
 
@@ -72,7 +71,6 @@ class Database(DatabaseBase):
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = None,
-        retry: bool = False,
         **query: str
     ) -> None: ...
 
@@ -85,7 +83,6 @@ class Database(DatabaseBase):
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = None,
-        retry: bool = False,
         **query: str
     ) -> None: ...
 
@@ -97,7 +94,6 @@ class Database(DatabaseBase):
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = None,
-        retry: bool = False,
         **query: str
     ) -> None: ...
 
@@ -113,7 +109,6 @@ class Database(DatabaseBase):
         max_overflow: int = 10,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = None,
-        retry: bool = False,
         **query: str
     ) -> None:
         """
@@ -136,7 +131,6 @@ class Database(DatabaseBase):
                 When is local database file, then is `-1`.
             - `Literal[-1]`: No recycle.
             - `int`: Use this value.
-        retry : Whether retry execute.
         query : Remote server database parameters.
         """
 
@@ -157,7 +151,6 @@ class Database(DatabaseBase):
             self.pool_recycle = -1
         else:
             self.pool_recycle = pool_recycle
-        self.retry = retry
         self.query = query
 
         # Create engine.
@@ -475,11 +468,8 @@ class Database(DatabaseBase):
             for key in sql_keys:
                 value = row.get(key)
 
-                # Fill.
-                if (
-                    not bool(value)
-                    and is_iterable(value)
-                ):
+                # Empty string.
+                if value == '':
                     value = None
 
                 # Convert.
@@ -548,10 +538,51 @@ class Database(DatabaseBase):
         return False
 
 
-    def executor(
+    def executor_report(
         self,
         connection: Connection,
         sql: TextClause,
+        data: list[dict]
+    ) -> Result:
+        """
+        SQL executor and report SQL execute information
+
+        Parameters
+        ----------
+        connection : Connection object.
+        sql : TextClause object.
+        data : Data set for filling.
+
+        Returns
+        -------
+        Result object.
+        """
+
+        # Execute.
+        execute = wrap_runtime(connection.execute, to_return=True)
+        result, report_runtime, *_ = execute(sql, data)
+
+        # Report.
+        report_info = (
+            f'{report_runtime}\n'
+            f'Row Count: {result.rowcount}'
+        )
+        sqls = [
+            sql_part.strip()
+            for sql_part in sql.text.split(';')
+            if sql_part != ''
+        ]
+        if data == []:
+            echo(report_info, *sqls, title='SQL')
+        else:
+            echo(report_info, *sqls, data, title='SQL')
+
+        return result
+
+
+    def executor(
+        self,
+        sql: TextClause,
         data: list[dict],
         report: bool
     ) -> Result:
@@ -560,7 +591,6 @@ class Database(DatabaseBase):
 
         Parameters
         ----------
-        connection : Connection object.
         sql : TextClause object.
         data : Data set for filling.
         report : Whether report SQL execute information.
@@ -570,32 +600,21 @@ class Database(DatabaseBase):
         Result object.
         """
 
-        # Create Transaction object.
-        with connection.begin():
+        # Create connection. 
+        with self.engine.connect() as connection:
 
-            # Execute.
+            # Create transaction.
+            with connection.begin():
 
-            ## Report.
-            if report:
-                execute = wrap_runtime(connection.execute, to_return=True)
-                result, report_runtime, *_ = execute(sql, data)
-                report_info = (
-                    f'{report_runtime}\n'
-                    f'Row Count: {result.rowcount}'
-                )
-                sqls = [
-                    sql_part.strip()
-                    for sql_part in sql.text.split(';')
-                    if sql_part != ''
-                ]
-                if data == []:
-                    echo(report_info, *sqls, title='SQL')
-                else:
-                    echo(report_info, *sqls, data, title='SQL')
+                # Execute.
 
-            ## Not report.
-            else:
-                result = connection.execute(sql, data)
+                ## Report.
+                if report:
+                    result = self.executor_report(connection, sql, data)
+
+                ## Not report.
+                else:
+                    result = connection.execute(sql, data)
 
         return result
 
@@ -642,24 +661,7 @@ class Database(DatabaseBase):
         data = self.handle_data(data, sql)
 
         # Execute.
-
-        ## Create Connection object.
-        with self.engine.connect() as connection:
-
-            ## Can retry.
-            if (
-                self.retry
-                and not self.is_multi_sql(sql)
-            ):
-                text = 'Retrying...'
-                title = 'Database Execute Operational Error'
-                handler = lambda exc_text, *_: echo(exc_text, text, title=title, frame='top')
-                executor = wrap_retry(self.executor, handler=handler, exception=OperationalError)
-                result = executor(self.connection, sql, data, report)
-
-            ## Cannot retry.
-            else:
-                result = self.executor(connection, sql, data, report)
+        result = self.executor(sql, data, report)
 
         return result
 

{reydb-1.1.44.dist-info → reydb-1.1.46.dist-info}/METADATA

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

{reydb-1.1.44.dist-info → reydb-1.1.46.dist-info}/RECORD

@@ -3,14 +3,14 @@ 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=YWscFMjBph9ttPXjzTTpaziTd7v7vnE0b7E4mVpJ6oc,6163
-reydb/rdb.py,sha256=3Kr8U6YoxExfUhiaSXUzvfwhOyAdcNZJYicr0Bb8zX4,54791
+reydb/rconn.py,sha256=jjcwxiBkE2h1nNvvLHZRXdIS-gZGUjFgkIMSP1CAmOc,3159
+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=kFKcExyU8PjWRTr6j7ZPB4qJqFMdYNDB77Nkpw4vHcE,15519
 reydb/rinfo.py,sha256=KXTkcpTGAD3p9RVKKcnmc_FjJtiKRPk-K5ZepPOnphQ,15253
 reydb/rparam.py,sha256=6cnSjNlX54iPS1uxMQdpazPM5XL4J87vVgfL6CIYG3U,7031
-reydb-1.1.44.dist-info/METADATA,sha256=PXJtLuxKaI5upHXQYr2PNoHONKV-TrsA2mzMJe3nou8,1550
-reydb-1.1.44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.44.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.44.dist-info/RECORD,,
+reydb-1.1.46.dist-info/METADATA,sha256=HnqlMGyE-v5bC4uW7n60v4p_Y17hpg-4UakaTpWhOpo,1550
+reydb-1.1.46.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.46.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.46.dist-info/RECORD,,