Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #595 -- Fixed error when sorting API results descending with cu…

…stom 'select' parameters. Thanks for the patch, Robert Wittams

git-svn-id: http://code.djangoproject.com/svn/django/trunk@792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 485042b74d1ee3abb2f2ab4b4d814f2b9bcdad2c 1 parent 9fe02e6
@adrianholovaty adrianholovaty authored
Showing with 8 additions and 5 deletions.
  1. +8 −5 django/core/meta/__init__.py
View
13 django/core/meta/__init__.py
@@ -1332,16 +1332,19 @@ def function_get_sql_clause(opts, **kwargs):
if f == '?': # Special case.
order_by.append(db.get_random_function_sql())
else:
+ if f.startswith('-'):
+ col_name = f[1:]
+ order = "DESC"
+ else:
+ col_name = f
+ order = "ASC"
# Use the database table as a column prefix if it wasn't given,
# and if the requested column isn't a custom SELECT.
- if "." not in f and f not in [k[0] for k in kwargs.get('select', [])]:
+ if "." not in col_name and col_name not in [k[0] for k in kwargs.get('select', [])]:
table_prefix = opts.db_table + '.'
else:
table_prefix = ''
- if f.startswith('-'):
- order_by.append('%s%s DESC' % (table_prefix, orderfield2column(f[1:], opts)))
- else:
- order_by.append('%s%s ASC' % (table_prefix, orderfield2column(f, opts)))
+ order_by.append('%s%s %s' % (table_prefix, orderfield2column(col_name, opts), order))
order_by = ", ".join(order_by)
# LIMIT and OFFSET clauses

0 comments on commit 485042b

Please sign in to comment.
Something went wrong with that request. Please try again.