mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
Fixed a false failure in the test suite when running Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
9797d51efe
commit
64ddff1b11
@ -831,7 +831,7 @@ in MySQL. This exercises that case.
|
||||
A values() or values_list() query across joined models must use outer joins
|
||||
appropriately.
|
||||
>>> Report.objects.values_list("creator__extra__info", flat=True).order_by("name")
|
||||
[u'e1', u'e2', None]
|
||||
[u'e1', u'e2', <NONE_OR_EMPTY_UNICODE>]
|
||||
|
||||
Similarly for select_related(), joins beyond an initial nullable join must
|
||||
use outer joins so that all results are included.
|
||||
@ -1146,6 +1146,14 @@ FieldError: Infinite loop caused by ordering.
|
||||
|
||||
"""
|
||||
|
||||
|
||||
# In Oracle, we expect a null CharField to return u'' instead of None.
|
||||
if settings.DATABASE_ENGINE == "oracle":
|
||||
__test__["API_TESTS"] = __test__["API_TESTS"].replace("<NONE_OR_EMPTY_UNICODE>", "u''")
|
||||
else:
|
||||
__test__["API_TESTS"] = __test__["API_TESTS"].replace("<NONE_OR_EMPTY_UNICODE>", "None")
|
||||
|
||||
|
||||
if settings.DATABASE_ENGINE == "mysql":
|
||||
__test__["API_TESTS"] += """
|
||||
When grouping without specifying ordering, we add an explicit "ORDER BY NULL"
|
||||
|
Loading…
Reference in New Issue
Block a user