Merge branch 'master' into fix_postgres_keyerror

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 0.6.0 (May 29th, 2022)
+
+* Dropped Python 3.6 support (#458)
+
+### Added
+
+* Add _mapping property to the result set interface (#447 )
+* Add contributing docs (#453 )
+
+### Fixed
+
+* Fix query result named access (#448)
+* Fix connections getting into a bad state when a task is cancelled (#457)
+* Revert #328 parallel transactions (#472)
+* Change extra installations to specific drivers (#436)
+
 ## 0.5.4 (January 14th, 2022)
 
 ### Added

databases/__init__.py

@@ -1,4 +1,4 @@
 from databases.core import Database, DatabaseURL
 
-__version__ = "0.5.4"
+__version__ = "0.6.0"
 __all__ = ["Database", "DatabaseURL"]

databases/core.py

@@ -315,6 +315,9 @@ def _build_query(
         return query
 
 
+_CallableType = typing.TypeVar("_CallableType", bound=typing.Callable)
+
+
 class Transaction:
     def __init__(
         self,
@@ -347,13 +350,13 @@ async def __aexit__(
         else:
             await self.commit()
 
-    def __await__(self) -> typing.Generator:
+    def __await__(self) -> typing.Generator[None, None, "Transaction"]:
         """
         Called if using the low-level `transaction = await database.transaction()`
         """
         return self.start().__await__()
 
-    def __call__(self, func: typing.Callable) -> typing.Callable:
+    def __call__(self, func: _CallableType) -> _CallableType:
         """
         Called if using `@database.transaction()` as a decorator.
         """
@@ -363,7 +366,7 @@ async def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.Any:
             async with self:
                 return await func(*args, **kwargs)
 
-        return wrapper
+        return wrapper  # type: ignore
 
     async def start(self) -> "Transaction":
         self._connection = self._connection_callable()