Ticket #6641: query.diff

django/db/models/query.py

@@ -273 +273 @@
         try:
             return self.get(**kwargs), False
         except self.model.DoesNotExist:
-            params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
-            params.update(defaults)
-            obj = self.model(**params)
-            obj.save()
-            return obj, True
+            try:
+                params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
+                params.update(defaults)
+                obj = self.model(**params)
+                obj.save()
+                return obj, True
+            except Exception, e:
+                if str(type(e)).find('IntegrityError') > -1:
+                    return self.get(**kwargs), False
+                else:
+                    raise e
 
     def latest(self, field_name=None):
         """