From 64ddff1b11290397bd10a81427840e2383da149d Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Mon, 23 Mar 2009 22:01:16 +0000 Subject: [PATCH] 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 --- 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 f92018a612..06c0ebf6e9 100644 --- a/tests/regressiontests/queries/models.py +++ b/tests/regressiontests/queries/models.py @@ -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', ] 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("", "u''") +else: + __test__["API_TESTS"] = __test__["API_TESTS"].replace("", "None") + + if settings.DATABASE_ENGINE == "mysql": __test__["API_TESTS"] += """ When grouping without specifying ordering, we add an explicit "ORDER BY NULL"