diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2020-11-27 18:04:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-11-27 18:04:13 +0000 |
| commit | 92ed93fedcac67675293cab3aac688b15cc2048a (patch) | |
| tree | e8687c5a47249c2f455e8f33609e60a3d44495be /lib | |
| parent | 2ecf94776fe47842eed54c0536813393bfc546c5 (diff) | |
| parent | 6125dfff91ca0093a00d78804917240617825c44 (diff) | |
| download | sqlalchemy-92ed93fedcac67675293cab3aac688b15cc2048a.tar.gz | |
Merge "Don't discard leftovers from surface_selectables"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 1bea97318..55c17a193 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -401,7 +401,12 @@ def surface_selectables_only(clause): elif isinstance(elem, FromGrouping): stack.append(elem.element) elif isinstance(elem, ColumnClause): - stack.append(elem.table) + if elem.table is not None: + stack.append(elem.table) + else: + yield elem + elif elem is not None: + yield elem def extract_first_column_annotation(column, annotation_name): |