mirror of
https://github.com/django/django.git
synced 2025-10-29 00:26:07 +00:00
Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
from django.db import models, DEFAULT_DB_ALIAS
|
||||
from django.db import models, DEFAULT_DB_ALIAS, connection
|
||||
from django.contrib.auth.models import User
|
||||
from django.conf import settings
|
||||
|
||||
@@ -31,7 +31,7 @@ class Stuff(models.Model):
|
||||
# Oracle doesn't distinguish between None and the empty string.
|
||||
# This hack makes the test case pass using Oracle.
|
||||
name = self.name
|
||||
if (settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] == 'django.db.backends.oracle'
|
||||
if (connection.features.interprets_empty_strings_as_nulls
|
||||
and name == u''):
|
||||
name = None
|
||||
return unicode(name) + u' is owned by ' + unicode(self.owner)
|
||||
|
||||
Reference in New Issue
Block a user