Ticket #16340: 16340_get_or_create_traceback.3.patch

django/db/models/query.py

@@ -4 +4 @@
 
 import copy
 from itertools import izip
+import sys
 
 from django.db import connections, router, transaction, IntegrityError
 from django.db.models.aggregates import Aggregate
@@ -387 +388 @@
                 return obj, True
             except IntegrityError, e:
                 transaction.savepoint_rollback(sid, using=self.db)
+                exc_info = sys.exc_info()
                 try:
                     return self.get(**lookup), False
                 except self.model.DoesNotExist:
-                    raise e
+                    # re-raise the IntegrityError with the original traceback.
+                    raise exc_info[1], None, exc_info[2]
 
     def latest(self, field_name=None):
         """

tests/modeltests/get_or_create/tests.py

@@ -1 +1 @@
 from datetime import date
+import sys
+import traceback
 
 from django.db import IntegrityError
 from django.test import TestCase
@@ -50 +52 @@
             ManualPrimaryKeyTest.objects.get_or_create, id=1, data="Different"
         )
         self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original")
+
+        # get_or_crete should raise IntegrityError's with the full traceback.
+        # This is tested by checking that a known method call is in the traceback.
+        try:
+            ManualPrimaryKeyTest.objects.get_or_create(id=1, data="Different")
+        except IntegrityError, e:
+            formatted_traceback = traceback.format_exc()
+            contains_insert_query = 'obj.save' in formatted_traceback
+            self.assertTrue(contains_insert_query, 
+                "The traceback didn't contain 'obj.save'.")
+ No newline at end of file