diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2011-01-10 13:44:35 +0000 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2011-01-10 13:44:35 +0000 |
| commit | ea774bf9a7620e71567b47489bdf6cea31e64afa (patch) | |
| tree | 2a5e89292afc6f4c4d64d584ddbfb950edff320e | |
| parent | 937548bba45c6933dab774b59fded8f0055e8937 (diff) | |
Fix wrong attribute name in [15156]. Thanks to Alex Gaynor for spotting this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/db/models/query.py | 4 | ||||
| -rw-r--r-- | tests/regressiontests/get_or_create_regress/models.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/get_or_create_regress/tests.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 5395af2331..477f04a964 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -371,8 +371,8 @@ class QuerySet(object): defaults = kwargs.pop('defaults', {}) lookup = kwargs.copy() for f in self.model._meta.fields: - if f.column in lookup: - lookup[f.name] = lookup.pop(f.column) + if f.attname in lookup: + lookup[f.name] = lookup.pop(f.attname) try: self._for_write = True return self.get(**lookup), False diff --git a/tests/regressiontests/get_or_create_regress/models.py b/tests/regressiontests/get_or_create_regress/models.py index 292d96c980..637bbf62af 100644 --- a/tests/regressiontests/get_or_create_regress/models.py +++ b/tests/regressiontests/get_or_create_regress/models.py @@ -10,4 +10,4 @@ class Author(models.Model): class Book(models.Model): name = models.CharField(max_length=100) 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") diff --git a/tests/regressiontests/get_or_create_regress/tests.py b/tests/regressiontests/get_or_create_regress/tests.py index e825fccc4b..103e254d4c 100644 --- a/tests/regressiontests/get_or_create_regress/tests.py +++ b/tests/regressiontests/get_or_create_regress/tests.py @@ -55,8 +55,10 @@ class GetOrCreateTests(TestCase): # 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) self.assertTrue(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) self.assertFalse(created) + # The publisher should have three books. self.assertEqual(p.books.count(), 3) |