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

[1.2.X] Fix wrong attribute name in [15156]. Thanks to Alex Gaynor for spotting this. 

Backport of [15169] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Andrew Godwin 2011-01-10 13:45:36 +00:00
parent 03ab30c3f1
commit 663eb9656a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/query.py
View File

@ -369,8 +369,8 @@ class QuerySet(object):
defaults = kwargs.pop('defaults', {}) defaults = kwargs.pop('defaults', {})
lookup = kwargs.copy() lookup = kwargs.copy()
for f in self.model._meta.fields: for f in self.model._meta.fields:
if f.column in lookup: if f.attname in lookup:
lookup[f.name] = lookup.pop(f.column) lookup[f.name] = lookup.pop(f.attname)
try: try:
self._for_write = True self._for_write = True
return self.get(**lookup), False return self.get(**lookup), False

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

@ -10,4 +10,4 @@ class Author(models.Model):
class Book(models.Model): class Book(models.Model):
name = models.CharField(max_length=100) name = models.CharField(max_length=100)
authors = models.ManyToManyField(Author, related_name='books') authors = models.ManyToManyField(Author, related_name='books')
publisher = models.ForeignKey(Publisher, related_name='books') publisher = models.ForeignKey(Publisher, related_name='books', db_column="publisher_id_column")

2
tests/regressiontests/get_or_create_regress/tests.py
View File

@ -55,8 +55,10 @@ class GetOrCreateTests(TestCase):
# Use the publisher's primary key value instead of a model instance. # Use the publisher's primary key value instead of a model instance.
_, created = ed.books.get_or_create(name='The Great Book of Ed', publisher_id=p.id) _, created = ed.books.get_or_create(name='The Great Book of Ed', publisher_id=p.id)
self.assertTrue(created) self.assertTrue(created)
# Try get_or_create again, this time nothing should be created. # Try get_or_create again, this time nothing should be created.
_, created = ed.books.get_or_create(name='The Great Book of Ed', publisher_id=p.id) _, created = ed.books.get_or_create(name='The Great Book of Ed', publisher_id=p.id)
self.assertFalse(created) self.assertFalse(created)
# The publisher should have three books. # The publisher should have three books.
self.assertEqual(p.books.count(), 3) self.assertEqual(p.books.count(), 3)