Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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
  • Loading branch information...
commit c663e8fbd73ad3ad2f4bd1cdb473b77963c2e352 1 parent d4677d4
@malcolmt malcolmt authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 django/db/models/sql/subqueries.py
View
9 django/db/models/sql/subqueries.py
@@ -313,9 +313,12 @@ def as_sql(self):
def execute_sql(self, return_id=False):
cursor = super(InsertQuery, self).execute_sql(None)
- if return_id and cursor:
- return self.connection.ops.last_insert_id(cursor,
- self.model._meta.db_table, self.model._meta.pk.column)
+ 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)
def insert_values(self, insert_values, raw_values=False):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.