From e81e64cd6361c43c775ccd52d9c4684fa935fcb7 Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Tue, 8 Mar 2011 19:38:54 +0000 Subject: [PATCH] [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 --- tests/regressiontests/admin_views/models.py | 4 ++-- tests/regressiontests/queries/models.py | 2 +- tests/regressiontests/queries/tests.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py index f6b5ce9f5a..c492b98ab7 100644 --- a/tests/regressiontests/admin_views/models.py +++ b/tests/regressiontests/admin_views/models.py @@ -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) diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py index d441433ba1..d1e5e6ea39 100644 --- a/tests/regressiontests/queries/models.py +++ b/tests/regressiontests/queries/models.py @@ -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 diff --git a/tests/regressiontests/queries/tests.py b/tests/regressiontests/queries/tests.py index ae1bdd36ee..3a4073812a 100644 --- a/tests/regressiontests/queries/tests.py +++ b/tests/regressiontests/queries/tests.py @@ -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):