Commit c663e8fb authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Return last insert ID correctly when the feature is enabled. 

This was overlooked when merging the patch from #3460 in r10029.
Thank to Ian Kelly for noticing. Refs #10467.

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

django/db/models/sql/subqueries.py

+6 −3
Original line number Diff line number Diff line
@@ -313,7 +313,10 @@ class InsertQuery(Query): 


    def execute_sql(self, return_id=False):

        cursor = super(InsertQuery, self).execute_sql(None)

        if return_id and cursor:

        if not (return_id and cursor):

            return

        if self.connection.features.can_return_id_from_insert:

            return cursor.fetchone()[0]

        return self.connection.ops.last_insert_id(cursor,

                self.model._meta.db_table, self.model._meta.pk.column)