p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed test suite on Oracle that was broken by using keyword "date" as a field name. Refs #4140 and #10422. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Matt Boersma 2009-05-07 14:48:04 +00:00
parent 9e7388f885
commit 523da3801d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ class FilePathModel(models.Model):
class Publication(models.Model): class Publication(models.Model):
title = models.CharField(max_length=30) title = models.CharField(max_length=30)
date = models.DateField() date_published = models.DateField()
def __unicode__(self): def __unicode__(self):
return self.title return self.title

10
tests/regressiontests/model_forms_regress/tests.py
View File

@ -71,13 +71,13 @@ class ManyToManyCallableInitialTests(TestCase):
# Set up a callable initial value # Set up a callable initial value
def formfield_for_dbfield(db_field, **kwargs): def formfield_for_dbfield(db_field, **kwargs):
if db_field.name == 'publications': if db_field.name == 'publications':
kwargs['initial'] = lambda: Publication.objects.all().order_by('date')[:2] kwargs['initial'] = lambda: Publication.objects.all().order_by('date_published')[:2]
return db_field.formfield(**kwargs) return db_field.formfield(**kwargs)
# Set up some Publications to use as data # Set up some Publications to use as data
Publication(title="First Book", date=date(2007,1,1)).save() Publication(title="First Book", date_published=date(2007,1,1)).save()
Publication(title="Second Book", date=date(2008,1,1)).save() Publication(title="Second Book", date_published=date(2008,1,1)).save()
Publication(title="Third Book", date=date(2009,1,1)).save() Publication(title="Third Book", date_published=date(2009,1,1)).save()
# Create a ModelForm, instantiate it, and check that the output is as expected # Create a ModelForm, instantiate it, and check that the output is as expected
ModelForm = modelform_factory(Article, formfield_callback=formfield_for_dbfield) ModelForm = modelform_factory(Article, formfield_callback=formfield_for_dbfield)
@ -88,5 +88,3 @@ class ManyToManyCallableInitialTests(TestCase):
<option value="2" selected="selected">Second Book</option> <option value="2" selected="selected">Second Book</option>
<option value="3">Third Book</option> <option value="3">Third Book</option>
</select> Hold down "Control", or "Command" on a Mac, to select more than one.</li>""") </select> Hold down "Control", or "Command" on a Mac, to select more than one.</li>""")