diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-11-04 17:02:24 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-11-04 18:07:21 -0400 |
| commit | 248d232459e38561999c4172acaaddd651c1a933 (patch) | |
| tree | 2cf38b16770ffd9e390cead0b39e9d87ae523e8d /lib/sqlalchemy/engine/util.py | |
| parent | fee0855bfe2982927ab21ce7398fa48b90af7ca4 (diff) | |
| download | sqlalchemy-248d232459e38561999c4172acaaddd651c1a933.tar.gz | |
Check for Mapping explicitly in 2.0 params
Fixed issue in future :class:`_future.Connection` object where the
:meth:`_future.Connection.execute` method would not accept a non-dict
mapping object, such as SQLAlchemy's own :class:`.RowMapping` or other
``abc.collections.Mapping`` object as a parameter dictionary.
Fixes: #7291
Change-Id: I819f079d86d19d1d81c570e0680f987e51e34b84
Diffstat (limited to 'lib/sqlalchemy/engine/util.py')
| -rw-r--r-- | lib/sqlalchemy/engine/util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/engine/util.py b/lib/sqlalchemy/engine/util.py index 4f2e031ab..8eb0f1820 100644 --- a/lib/sqlalchemy/engine/util.py +++ b/lib/sqlalchemy/engine/util.py @@ -147,9 +147,9 @@ def _distill_params_20(params): elif isinstance( params, (tuple, dict, immutabledict), - # avoid abc.__instancecheck__ - # (collections_abc.Sequence, collections_abc.Mapping), - ): + # only do abc.__instancecheck__ for Mapping after we've checked + # for plain dictionaries and would otherwise raise + ) or isinstance(params, collections_abc.Mapping): return (params,), _no_kw else: raise exc.ArgumentError("mapping or sequence expected for parameters") |