diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2017-01-09 14:25:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2017-01-09 14:25:13 -0500 |
| commit | e6eefc0c5e946f10cb31264d71d6f1987a3f96e8 (patch) | |
| tree | 43bcd77ef4ff66907bde17117cdfd7b3d5fff927 /lib/sqlalchemy/sql/selectable.py | |
| parent | bc4a96836d5bfb911da26f7e77119f3a7b356f2e (diff) | |
| parent | 6b489db89970b1fcec38a7c3772960ed3291a2ed (diff) | |
| download | sqlalchemy-e6eefc0c5e946f10cb31264d71d6f1987a3f96e8.tar.gz | |
Merge "Tighten rules for order_by(Label) resolution"
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index f7dbd8231..1840d646d 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -2275,7 +2275,7 @@ class CompoundSelect(GenerativeSelect): d = dict( (c.key, c) for c in self.c ) - return d, d + return d, d, d @classmethod def _create_union(cls, *selects, **kwargs): @@ -2948,10 +2948,11 @@ class Select(HasPrefixes, HasSuffixes, GenerativeSelect): only_froms = dict( (c.key, c) for c in _select_iterables(self.froms) if c._allow_label_resolve) + only_cols = with_cols.copy() for key, value in only_froms.items(): with_cols.setdefault(key, value) - return with_cols, only_froms + return with_cols, only_froms, only_cols def is_derived_from(self, fromclause): if self in fromclause._cloned_set: |