summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/util.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-04-27 17:32:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-04-27 17:40:41 -0400
commit34f98a63b54a17c06e48eab5a29e9c090488b4bd (patch)
treea3e82f802d78a67bea9ee92bec4982800de0b831 /lib/sqlalchemy/sql/util.py
parente5c20fce93549d9af972e99a7bf826d7cc99189f (diff)
downloadsqlalchemy-34f98a63b54a17c06e48eab5a29e9c090488b4bd.tar.gz
- altered part of the use contract first set up in #2992; we
now skip textual label references when copying ORDER BY elements to the joined-eager-load subquery, as we can't know that these expressions are compatible with this placement; either because they are meant for text(), or because they refer to label names already stated and aren't bound to a table. fixes #3392
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
-rw-r--r--lib/sqlalchemy/sql/util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index bec5b5824..8f502fc86 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -16,7 +16,8 @@ from itertools import chain
from collections import deque
from .elements import BindParameter, ColumnClause, ColumnElement, \
- Null, UnaryExpression, literal_column, Label, _label_reference
+ Null, UnaryExpression, literal_column, Label, _label_reference, \
+ _textual_label_reference
from .selectable import ScalarSelect, Join, FromClause, FromGrouping
from .schema import Column
@@ -163,6 +164,8 @@ def unwrap_order_by(clause):
):
if isinstance(t, _label_reference):
t = t.element
+ if isinstance(t, (_textual_label_reference)):
+ continue
cols.add(t)
else:
for c in t.get_children():