Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed test failure caused by different NULL ordering between backends

  • Loading branch information...
commit 8dc76c4b9108f49afc5db07a23f34ad259a7642b 1 parent 9054098
@akaariai akaariai authored
View
3  django/db/backends/__init__.py
@@ -595,6 +595,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
View
1  django/db/backends/postgresql_psycopg2/base.py
@@ -55,6 +55,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
supports_tablespaces = True
supports_transactions = True
can_distinct_on_fields = True
+ nulls_order_largest = True
class DatabaseWrapper(BaseDatabaseWrapper):
View
4 tests/queries/models.py
@@ -262,9 +262,13 @@ def __str__(self):
return self.name
# A simpler shared-foreign-key setup that can expose some problems.
+@python_2_unicode_compatible
class SharedConnection(models.Model):
data = models.CharField(max_length=10)
+ def __str__(self):
+ return self.data
+
class PointerA(models.Model):
connection = models.ForeignKey(SharedConnection)
View
8 tests/queries/tests.py
@@ -2984,7 +2984,11 @@ def test_ticket_14056(self):
s2 = SharedConnection.objects.create(data='s2')
s3 = SharedConnection.objects.create(data='s3')
PointerA.objects.create(connection=s2)
+ expected_ordering = (
+ [s1, s3, s2] if connection.features.nulls_order_largest
+ else [s2, s1, s3]
+ )
self.assertQuerysetEqual(
- SharedConnection.objects.order_by('pointera__connection', 'pk'),
- [s1, s3, s2], lambda x: x
+ SharedConnection.objects.order_by('-pointera__connection', 'pk'),
+ expected_ordering, lambda x: x
)

0 comments on commit 8dc76c4

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