Commit ddc156bc authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Fixed #6970 -- Raise the original `IntegrityError` when all required fields... 

Fixed #6970 -- Raise the original `IntegrityError` when all required fields aren't specified in `get_or_create` instead of a misleading `DoesNotExist` error, thanks deadwisdom.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3b45a40c

django/db/models/query.py

+4 −1
Original line number Diff line number Diff line
@@ -332,7 +332,10 @@ class QuerySet(object): 
                return obj, True

            except IntegrityError, e:

                transaction.savepoint_rollback(sid)

                try:

                    return self.get(**kwargs), False

                except self.model.DoesNotExist:

                    raise e



    def latest(self, field_name=None):

        """

tests/modeltests/get_or_create/models.py

+7 −0
Original line number Diff line number Diff line
@@ -50,4 +50,11 @@ True 
False

>>> Person.objects.count()

2



# If you don't specify a value or default value for all required fields, you

# will get an error.

>>> p, created = Person.objects.get_or_create(first_name='Tom', last_name='Smith')

Traceback (most recent call last):

...

IntegrityError:...

"""}