Skip to content
Browse files

Fixed a false failure in the test suite when running Oracle.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 9797d51 commit 64ddff1b11290397bd10a81427840e2383da149d @ikelly ikelly committed
Showing with 9 additions and 1 deletion.
  1. +9 −1 tests/regressiontests/queries/
10 tests/regressiontests/queries/
@@ -831,7 +831,7 @@ def __unicode__(self):
A values() or values_list() query across joined models must use outer joins
>>> 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 @@ def __unicode__(self):
+# 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''")
+ __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"

0 comments on commit 64ddff1

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