reydb 1.1.53__py3-none-any.whl → 1.1.54__py3-none-any.whl

reydb/rconn.py

@@ -153,8 +153,7 @@ class DatabaseConnection(DatabaseBase):
             self.commit()
 
         # Close.
-        else:
-            self.close()
+        self.close()
 
 
     def insert_id(self) -> int:
@@ -200,9 +199,9 @@ class DatabaseConnectionAsync(DatabaseBase):
         # Build.
         self.db = db
         self.autocommit = autocommit
-        self.execute = DatabaseExecuteAsync(self)
-        self.conn: AsyncConnection | None = None
-        self.begin: AsyncTransaction | None = None
+        self.aexecute = DatabaseExecuteAsync(self)
+        self.aconn: AsyncConnection | None = None
+        self.abegin: AsyncTransaction | None = None
 
 
     async def get_conn(self) -> AsyncConnection:
@@ -215,10 +214,10 @@ class DatabaseConnectionAsync(DatabaseBase):
         """
 
         # Create.
-        if self.conn is None:
-            self.conn = await self.db.aengine.connect()
+        if self.aconn is None:
+            self.aconn = await self.db.aengine.connect()
 
-        return self.conn
+        return self.aconn
 
 
     async def get_begin(self) -> AsyncTransaction:
@@ -231,11 +230,11 @@ class DatabaseConnectionAsync(DatabaseBase):
         """
 
         # Create.
-        if self.begin is None:
+        if self.abegin is None:
             conn = await self.get_conn()
-            self.begin = await conn.begin()
+            self.abegin = await conn.begin()
 
-        return self.begin
+        return self.abegin
 
 
     async def commit(self) -> None:
@@ -244,9 +243,9 @@ class DatabaseConnectionAsync(DatabaseBase):
         """
 
         # Commit.
-        if self.begin is not None:
-            await self.begin.commit()
-            self.begin = None
+        if self.abegin is not None:
+            await self.abegin.commit()
+            self.abegin = None
 
 
     async def rollback(self) -> None:
@@ -255,9 +254,9 @@ class DatabaseConnectionAsync(DatabaseBase):
         """
 
         # Rollback.
-        if self.begin is not None:
-            await self.begin.rollback()
-            self.begin = None
+        if self.abegin is not None:
+            await self.abegin.rollback()
+            self.abegin = None
 
 
     async def close(self) -> None:
@@ -266,15 +265,15 @@ class DatabaseConnectionAsync(DatabaseBase):
         """
 
         # Close.
-        if self.begin is not None:
-            await self.begin.close()
-            self.begin = None
-        if self.conn is not None:
-            await self.conn.close()
-            self.conn = None
+        if self.abegin is not None:
+            await self.abegin.close()
+            self.abegin = None
+        if self.aconn is not None:
+            await self.aconn.close()
+            self.aconn = None
 
 
-    async def __aenter__(self) -> Self:
+    async def __aenter__(self):
         """
         Asynchronous enter syntax `async with`.
 
@@ -304,8 +303,8 @@ class DatabaseConnectionAsync(DatabaseBase):
             await self.commit()
 
         # Close.
-        else:
-            await self.close()
+        await self.close()
+        await self.db.dispose()
 
 
     async def insert_id(self) -> int:
@@ -319,7 +318,7 @@ class DatabaseConnectionAsync(DatabaseBase):
 
         # Get.
         sql = 'SELECT LAST_INSERT_ID()'
-        result = await self.execute(sql)
+        result = await self.aexecute(sql)
         id_ = result.scalar()
 
         return id_

reydb/rdb.py

@@ -100,7 +100,8 @@ class Database(DatabaseBase):
         """
 
         # Get.
-        url_params = extract_url(self.url)
+        url = self.url(False)
+        url_params = extract_url(url)
         backend = url_params['backend']
 
         return backend
@@ -117,17 +118,57 @@ class Database(DatabaseBase):
         """
 
         # Get.
-        url_params = extract_url(self.url)
+        url = self.url(False)
+        url_params = extract_url(url)
         driver = url_params['driver']
 
         return driver
 
 
     @property
-    def url(self) -> str:
+    def abackend(self) -> str:
+        """
+        Asynchronous database backend name.
+
+        Returns
+        -------
+        Name.
+        """
+
+        # Get.
+        url = self.url(True)
+        url_params = extract_url(url)
+        backend = url_params['backend']
+
+        return backend
+
+
+    @property
+    def adriver(self) -> str:
+        """
+        Asynchronous database driver name.
+
+        Returns
+        -------
+        Name.
+        """
+
+        # Get.
+        url = self.url(True)
+        url_params = extract_url(url)
+        driver = url_params['driver']
+
+        return driver
+
+
+    def url(self, is_async: bool) -> str:
         """
         Generate server URL.
 
+        Parameters
+        ----------
+        is_async : Whether to use asynchronous engine.
+
         Returns
         -------
         Server URL.
@@ -135,7 +176,7 @@ class Database(DatabaseBase):
 
         # Generate URL.
         password = urllib_quote(self.password)
-        if self.is_async:
+        if is_async:
             url_ = f'mysql+aiomysql://{self.username}:{password}@{self.host}:{self.port}/{self.database}'
         else:
             url_ = f'mysql+pymysql://{self.username}:{password}@{self.host}:{self.port}/{self.database}'
@@ -173,8 +214,9 @@ class Database(DatabaseBase):
         """
 
         # Handle parameter.
+        url = self.url(is_async)
         engine_params = {
-            'url': self.url,
+            'url': url,
             'pool_size': self.pool_size,
             'max_overflow': self.max_overflow,
             'pool_timeout': self.pool_timeout,
@@ -191,6 +233,15 @@ class Database(DatabaseBase):
         return engine
 
 
+    async def dispose(self) -> None:
+        """
+        Dispose asynchronous connections.
+        """
+
+        # Dispose.
+        await self.aengine.dispose()
+
+
     def __conn_count(self, is_async: bool) -> tuple[int, int]:
         """
         Count number of keep open and allowed overflow connection.
@@ -397,7 +448,7 @@ class Database(DatabaseBase):
 
         # Build.
         dbconn = self.aconnect(True)
-        exec = dbconn.execute
+        exec = dbconn.aexecute
 
         return exec
 

reydb/rexec.py

@@ -716,6 +716,7 @@ class DatabaseExecute(DatabaseExecuteBase):
         # Automatic commit.
         if self.dbconn.autocommit:
             self.dbconn.commit()
+            self.dbconn.close()
 
         return result
 
@@ -1235,7 +1236,7 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
         if report:
             tm = TimeMark()
             tm()
-            result = await self.dbconn.conn.execute(sql, data)
+            result = await self.dbconn.aconn.execute(sql, data)
             tm()
 
             ### Generate report.
@@ -1267,11 +1268,13 @@ class DatabaseExecuteAsync(DatabaseExecuteBase):
 
         ## Not report.
         else:
-            result = await self.dbconn.conn.execute(sql, data)
+            result = await self.dbconn.aconn.execute(sql, data)
 
         # Automatic commit.
         if self.dbconn.autocommit:
             await self.dbconn.commit()
+            await self.dbconn.close()
+            await self.dbconn.db.dispose()
 
         return result
 

{reydb-1.1.53.dist-info → reydb-1.1.54.dist-info}/METADATA

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

{reydb-1.1.53.dist-info → reydb-1.1.54.dist-info}/RECORD

@@ -3,15 +3,15 @@ reydb/rall.py,sha256=GsXHqvT1k--U53HpDY4SALjIHN8rwgSxeXpJjH5gq2E,409
 reydb/rbase.py,sha256=rgAkEHLXDoMfiNCN2ckPQD-Eyd1tp0f122LEbI7L1Qg,8947
 reydb/rbuild.py,sha256=6N8aLqCeX8JnOwQstVA2AuM0Rl5kUHx5Enrm2GGcGvo,31852
 reydb/rconfig.py,sha256=UTpJ9psCrQlFx3FJ5_B8WkURRQ5PD6ZHLYg7MQRebmU,12659
-reydb/rconn.py,sha256=Hsr4DIlQ1vFstveYnKaxAMgn18T-ggCwuUMDJi9qGNQ,6542
-reydb/rdb.py,sha256=bMv98QNWYzVn6EFX9JiyihiJ5n-BZVJH8mTzkkReyaU,14948
+reydb/rconn.py,sha256=VgzoI5gMHi5yMyUpLsPuMmuFkYDHCc0uuRXh_yUPY94,6551
+reydb/rdb.py,sha256=SEozALLuJO16CrGDDz3kYRY9Ubt-Kh4wn9LibKnT23M,15944
 reydb/rerror.py,sha256=Lsl7UECYdIFYjd9t7RhvNcHdyGStI3gffm8zmkK1DEc,9943
-reydb/rexec.py,sha256=Q2__f_2-nnx-ESNZwBUUMq7WJztqhYeK8HehyiuVqlw,53981
+reydb/rexec.py,sha256=sTb9IOldf6USK-Qo9xV03wHlniU7xAQHYZZKT3B0jPA,54099
 reydb/rfile.py,sha256=RI1jMsNNJWvdky3oRV1Gw-9-tc1F92QjD24s2eusCVI,15184
 reydb/rinfo.py,sha256=4btKBBZzVXGuPsmswqXDxvjZQuAc9raQ0tpXvmft71s,12741
 reydb/rorm.py,sha256=JUwKZ9OgrI_FvTwTDfZhozpJB1v1xk_o3ESPLGTXXYI,23693
 reydb/rparam.py,sha256=six7wwQRKycoscv-AGyQqsPjA4_TZgcGQ_jk7FZytQs,6803
-reydb-1.1.53.dist-info/METADATA,sha256=UAgUFGAEId9qYGrK4ojOZeNZV61a3tp09leBSNdIGXU,1550
-reydb-1.1.53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.1.53.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.1.53.dist-info/RECORD,,
+reydb-1.1.54.dist-info/METADATA,sha256=TYQClPsAsRBW3S5s0NBbP4gzxkQMge1QMXNGksbhi8Y,1550
+reydb-1.1.54.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.1.54.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.1.54.dist-info/RECORD,,