diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-06-08 18:00:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-06-08 18:00:44 +0000 |
| commit | 5a0c700bb96bf2d80cfbf03f5ddfa97964987e4e (patch) | |
| tree | 5cf4357c26a52b2daae24168adb2225dbe14cd81 /lib/sqlalchemy/engine | |
| parent | 14a4849e14a4f94dfcb5cef3600d439b7c716344 (diff) | |
| parent | 4e8577ca66d194661b1fed01c46a529655473b97 (diff) | |
| download | sqlalchemy-5a0c700bb96bf2d80cfbf03f5ddfa97964987e4e.tar.gz | |
Merge "restore adapter logic in ORM loading"
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/default.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index aa7e4e5e9..7b3fa091f 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -1418,6 +1418,10 @@ class DefaultExecutionContext(interfaces.ExecutionContext): strategy = _cursor._NO_CURSOR_DQL if self._is_future_result: + if self.root_connection.should_close_with_result: + raise exc.InvalidRequestError( + "can't use future_result=True with close_with_result" + ) result = _cursor.CursorResult( self, strategy, cursor_description ) |