diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-08-26 17:20:41 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-08-26 17:20:56 -0400 |
| commit | 4d63b472f272138eca0286fd6c4a7bf52e9be3c3 (patch) | |
| tree | abe53bdc05dc410c3a885f3635b093ae5a994020 /lib/sqlalchemy/sql/util.py | |
| parent | 0127ac668e405584d74c92768a9f0dc7913798fe (diff) | |
| parent | 7c4512cbeb1cf9e4e988e833589ddc6377b5e525 (diff) | |
| download | sqlalchemy-4d63b472f272138eca0286fd6c4a7bf52e9be3c3.tar.gz | |
Merge branch 'ticket_3516'
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 8f502fc86..cbd74faac 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -154,6 +154,7 @@ def unwrap_order_by(clause): without DESC/ASC/NULLS FIRST/NULLS LAST""" cols = util.column_set() + result = [] stack = deque([clause]) while stack: t = stack.popleft() @@ -166,11 +167,13 @@ def unwrap_order_by(clause): t = t.element if isinstance(t, (_textual_label_reference)): continue - cols.add(t) + if t not in cols: + cols.add(t) + result.append(t) else: for c in t.get_children(): stack.append(c) - return cols + return result def clause_is_present(clause, search): |