From 7499416d0d95279e9034f4b0480287e3ce2cb4e4 Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Mon, 23 Mar 2009 22:11:07 +0000 Subject: [PATCH] [1.0.X] Fixed a false failure in the test suite when running Oracle. Backport of [10125] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10126 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/queries/models.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py index c95171d0b1..006a0fa377 100644 --- a/tests/regressiontests/queries/models.py +++ b/tests/regressiontests/queries/models.py @@ -830,7 +830,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', ] Similarly for select_related(), joins beyond an initial nullable join must use outer joins so that all results are included. @@ -1115,6 +1115,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("", "u''") +else: + __test__["API_TESTS"] = __test__["API_TESTS"].replace("", "None") + + # Generator expressions are only in Python 2.4 and later. if sys.version_info >= (2, 4): __test__["API_TESTS"] += """