summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2022-03-02 21:43:53 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2022-03-02 21:47:01 -0500
commit43cf4a9e5d66946a6a982ab3e1e513bb426eb35b (patch)
tree0a5668a56cf3e1de2488455aed076941b5b7f15c /lib/sqlalchemy/engine
parent3fd1a52794c5463854fe36cbe97595d8489bbf62 (diff)
downloadsqlalchemy-43cf4a9e5d66946a6a982ab3e1e513bb426eb35b.tar.gz
improve error raise for dialect/pool events w/ async engine
Fixed issues where a descriptive error message was not raised for some classes of event listening with an async engine, which should instead be a sync engine instance. Change-Id: I00b9f4fe9373ef5fd5464fac10651cc4024f648e
Diffstat (limited to 'lib/sqlalchemy/engine')
-rw-r--r--lib/sqlalchemy/engine/events.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/events.py b/lib/sqlalchemy/engine/events.py
index 0cbf56a6d..699faf489 100644
--- a/lib/sqlalchemy/engine/events.py
+++ b/lib/sqlalchemy/engine/events.py
@@ -779,7 +779,7 @@ class DialectEvents(event.Events[Dialect]):
@classmethod
def _accept_with(
cls, target: Union[Engine, Type[Engine], Dialect, Type[Dialect]]
- ) -> Union[Dialect, Type[Dialect]]:
+ ) -> Optional[Union[Dialect, Type[Dialect]]]:
if isinstance(target, type):
if issubclass(target, Engine):
return Dialect
@@ -787,8 +787,14 @@ class DialectEvents(event.Events[Dialect]):
return target
elif isinstance(target, Engine):
return target.dialect
- else:
+ elif isinstance(target, Dialect):
return target
+ elif hasattr(target, "dispatch") and hasattr(
+ target.dispatch._events, "_no_async_engine_events"
+ ):
+ target.dispatch._events._no_async_engine_events()
+ else:
+ return None
def do_connect(
self,