diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-02-15 19:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-02-15 19:33:05 +0000 |
| commit | 787280e6d776a5d55f508bc3703d3fb4c9ad3fb9 (patch) | |
| tree | 53ea7e3675c58d466cf2f672fde0d1fdb1685b71 /lib/sqlalchemy/sql | |
| parent | 857adaaf867df54d4a023cf19f618fdf1d0f60c9 (diff) | |
| parent | 120347aad15fac4a54e16aa60e0e5b3b6b3995c4 (diff) | |
| download | sqlalchemy-787280e6d776a5d55f508bc3703d3fb4c9ad3fb9.tar.gz | |
Merge "Support legacy select(<iterable>) in addition to select(<list>) in v1.4"
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 23fdf7e12..ee2c4dafc 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -4861,7 +4861,11 @@ class Select( constructs as given, as well as ORM-mapped classes. """ - if (args and isinstance(args[0], list)) or kw: + if ( + args + and hasattr(args[0], "__iter__") + and not isinstance(args[0], util.string_types + (ClauseElement,)) + ) or kw: return cls.create_legacy_select(*args, **kw) else: return cls._create_future_select(*args) |