innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.2.X] Fixed field names that were preventing the tests from running in Oracle. Backport of r15774 from trunk. 

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ian Kelly 2011-03-08 19:38:54 +00:00
parent ee31d7124f
commit e81e64cd63
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/regressiontests/admin_views/models.py
View File

@ -673,7 +673,7 @@ class Paper(models.Model):
class CoverLetter(models.Model):
author = models.CharField(max_length=30)
date = models.DateField(null=True, blank=True)
date_written = models.DateField(null=True, blank=True)
def __unicode__(self):
return self.author
@ -696,7 +696,7 @@ class CoverLetterAdmin(admin.ModelAdmin):
def queryset(self, request):
#return super(CoverLetterAdmin, self).queryset(request).only('author')
return super(CoverLetterAdmin, self).queryset(request).defer('date')
return super(CoverLetterAdmin, self).queryset(request).defer('date_written')
class Story(models.Model):
title = models.CharField(max_length=100)

2
tests/regressiontests/queries/models.py
View File

@ -305,7 +305,7 @@ class ObjectA(models.Model):
class ObjectB(models.Model):
name = models.CharField(max_length=50)
objecta = models.ForeignKey(ObjectA)
number = models.PositiveSmallIntegerField()
num = models.PositiveSmallIntegerField()
def __unicode__(self):
return self.name

4
tests/regressiontests/queries/tests.py
View File

@ -1582,7 +1582,7 @@ class UnionTests(unittest.TestCase):
objectas.append(o)
b_info = [('un', 1, objectas[0]), ('deux', 2, objectas[0]), ('trois', 3, objectas[2])]
for name, number, objecta in b_info:
o = ObjectB(name=name, number=number, objecta=objecta)
o = ObjectB(name=name, num=number, objecta=objecta)
o.save()
objectbs.append(o)
c_info = [('ein', objectas[2], objectbs[2]), ('zwei', objectas[1], objectbs[1])]
@ -1603,7 +1603,7 @@ class UnionTests(unittest.TestCase):
def test_A_AB2(self):
Q1 = Q(name='two')
Q2 = Q(objectb__name='deux', objectb__number=2)
Q2 = Q(objectb__name='deux', objectb__num=2)
self.check_union(ObjectA, Q1, Q2)
def test_AB_ACB(self):