Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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 authored March 08, 2011
4  tests/regressiontests/admin_views/models.py
@@ -710,7 +710,7 @@ class Paper(models.Model):
710 710
 
711 711
 class CoverLetter(models.Model):
712 712
     author = models.CharField(max_length=30)
713  
-    date = models.DateField(null=True, blank=True)
  713
+    date_written = models.DateField(null=True, blank=True)
714 714
 
715 715
     def __unicode__(self):
716 716
         return self.author
@@ -733,7 +733,7 @@ class CoverLetterAdmin(admin.ModelAdmin):
733 733
 
734 734
     def queryset(self, request):
735 735
         #return super(CoverLetterAdmin, self).queryset(request).only('author')
736  
-        return super(CoverLetterAdmin, self).queryset(request).defer('date')
  736
+        return super(CoverLetterAdmin, self).queryset(request).defer('date_written')
737 737
 
738 738
 class Story(models.Model):
739 739
     title = models.CharField(max_length=100)
2  tests/regressiontests/queries/models.py
@@ -305,7 +305,7 @@ def __unicode__(self):
305 305
 class ObjectB(models.Model):
306 306
     name = models.CharField(max_length=50)
307 307
     objecta = models.ForeignKey(ObjectA)
308  
-    number = models.PositiveSmallIntegerField()
  308
+    num = models.PositiveSmallIntegerField()
309 309
 
310 310
     def __unicode__(self):
311 311
         return self.name
5  tests/regressiontests/queries/tests.py
@@ -1675,7 +1675,7 @@ def setUp(self):
1675 1675
             objectas.append(o)
1676 1676
         b_info = [('un', 1, objectas[0]), ('deux', 2, objectas[0]), ('trois', 3, objectas[2])]
1677 1677
         for name, number, objecta in b_info:
1678  
-            o = ObjectB(name=name, number=number, objecta=objecta)
  1678
+            o = ObjectB(name=name, num=number, objecta=objecta)
1679 1679
             o.save()
1680 1680
             objectbs.append(o)
1681 1681
         c_info = [('ein', objectas[2], objectbs[2]), ('zwei', objectas[1], objectbs[1])]
@@ -1696,7 +1696,7 @@ def test_A_AB(self):
1696 1696
 
1697 1697
     def test_A_AB2(self):
1698 1698
         Q1 = Q(name='two')
1699  
-        Q2 = Q(objectb__name='deux', objectb__number=2)
  1699
+        Q2 = Q(objectb__name='deux', objectb__num=2)
1700 1700
         self.check_union(ObjectA, Q1, Q2)
1701 1701
 
1702 1702
     def test_AB_ACB(self):
@@ -1718,4 +1718,3 @@ def test_BA_BCA__BAB_BAC_BCA(self):
1718 1718
         Q1 = Q(objecta__name='one', objectc__objecta__name='two')
1719 1719
         Q2 = Q(objecta__objectc__name='ein', objectc__objecta__name='three', objecta__objectb__name='trois')
1720 1720
         self.check_union(ObjectB, Q1, Q2)
1721  
-

0 notes on commit 8b22f7c

Please sign in to comment.
Something went wrong with that request. Please try again.