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/compiler.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/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 0ead0994f..99defd861 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -580,11 +580,11 @@ class SQLCompiler(Compiled): if self.stack and self.dialect.supports_simple_order_by_label: selectable = self.stack[-1]['selectable'] - with_cols, only_froms = selectable._label_resolve_dict + with_cols, only_froms, only_cols = selectable._label_resolve_dict if within_columns_clause: resolve_dict = only_froms else: - resolve_dict = with_cols + resolve_dict = only_cols # this can be None in the case that a _label_reference() # were subject to a replacement operation, in which case @@ -593,11 +593,11 @@ class SQLCompiler(Compiled): order_by_elem = element.element._order_by_label_element if order_by_elem is not None and order_by_elem.name in \ - resolve_dict: - + resolve_dict and \ + order_by_elem.shares_lineage( + resolve_dict[order_by_elem.name]): kwargs['render_label_as_label'] = \ element.element._order_by_label_element - return self.process( element.element, within_columns_clause=within_columns_clause, **kwargs) @@ -611,7 +611,7 @@ class SQLCompiler(Compiled): ) selectable = self.stack[-1]['selectable'] - with_cols, only_froms = selectable._label_resolve_dict + with_cols, only_froms, only_cols = selectable._label_resolve_dict try: if within_columns_clause: col = only_froms[element.element] |