summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAnssi Kääriäinen <akaariai@gmail.com>2013-08-20 11:33:44 +0300
committerAndrew Godwin <andrew@aeracode.org>2013-08-21 22:31:50 +0100
commitced3e6b17d18174216cdbe1ec7c24cc1819db787 (patch)
tree7a1cb4d9a5e10c068a963eafba3edec46220aec3 /django
parentcea720450485e0871daa7f9477fdf2bff5a5b821 (diff)
Fixed test failure caused by different NULL ordering between backends
Diffstat (limited to 'django')
-rw-r--r--django/db/backends/__init__.py3
-rw-r--r--django/db/backends/postgresql_psycopg2/base.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index 771b9af59c..8d3c09ab1a 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -599,6 +599,9 @@ class BaseDatabaseFeatures(object):
# to remove any ordering?
requires_explicit_null_ordering_when_grouping = False
+ # Does the backend order NULL values as largest or smallest?
+ nulls_order_largest = False
+
# Is there a 1000 item limit on query parameters?
supports_1000_query_parameters = True
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index f283476429..76b2935a1f 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -58,6 +58,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
can_distinct_on_fields = True
can_rollback_ddl = True
supports_combined_alters = True
+ nulls_order_largest = True
class DatabaseWrapper(BaseDatabaseWrapper):