diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index b6047febae..72948f9cd7 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -347,7 +347,9 @@ class SQLCompiler(object): elif not self.query.default_ordering: ordering = self.query.order_by else: - ordering = self.query.order_by or self.query.model._meta.ordering + ordering = (self.query.order_by + or self.query.model._meta.ordering + or []) qn = self.quote_name_unless_alias qn2 = self.connection.ops.quote_name distinct = self.query.distinct |