Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed field names that were preventing the tests from running in Oracle.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8b22f7cf78c0b66831e91e1d73d4be6e4a201f30 1 parent c260c53
Ian Kelly ikelly authored
4 tests/regressiontests/admin_views/models.py
View
@@ -710,7 +710,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
@@ -733,7 +733,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
@@ -305,7 +305,7 @@ def __unicode__(self):
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
5 tests/regressiontests/queries/tests.py
View
@@ -1675,7 +1675,7 @@ def setUp(self):
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])]
@@ -1696,7 +1696,7 @@ def test_A_AB(self):
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):
@@ -1718,4 +1718,3 @@ def test_BA_BCA__BAB_BAC_BCA(self):
Q1 = Q(objecta__name='one', objectc__objecta__name='two')
Q2 = Q(objecta__objectc__name='ein', objectc__objecta__name='three', objecta__objectb__name='trois')
self.check_union(ObjectB, Q1, Q2)
-
Please sign in to comment.
Something went wrong with that request. Please try again.