Ticket #9029: 9029-get-or-create-r12805.diff

django/db/models/query.py

@@ -359 +359 @@
         assert kwargs, \
                 'get_or_create() must be passed at least one keyword argument'
         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)
         try:
             self._for_write = True
-            return self.get(**kwargs), False
+            return self.get(**lookup), False
         except self.model.DoesNotExist:
             try:
                 params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
@@ -374 +378 @@
             except IntegrityError, e:
                 transaction.savepoint_rollback(sid, using=self.db)
                 try:
-                    return self.get(**kwargs), False
+                    return self.get(**lookup), False
                 except self.model.DoesNotExist:
                     raise e
 

tests/regressiontests/get_or_create_regress/models.py

@@ -38 +38 @@
 >>> p.books.count()
 1
 
+# Use the publisher's primary key instead of a model instance.
+>>> book, created = Book.objects.get_or_create(publisher_id=p.id, name='The Great Book of Ed')
+>>> created
+True
+>>> book.publisher == p
+True
+
 #
 # ManyRelatedManager
 #