innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2009-03-12 05:31:34 +00:00
parent d4677d4bfb
commit c663e8fbd7
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/db/models/sql/subqueries.py
View File

@ -313,9 +313,12 @@ class InsertQuery(Query):
def execute_sql(self, return_id=False): def execute_sql(self, return_id=False):
cursor = super(InsertQuery, self).execute_sql(None) cursor = super(InsertQuery, self).execute_sql(None)
if return_id and cursor: if not (return_id and cursor):
return self.connection.ops.last_insert_id(cursor, return
self.model._meta.db_table, self.model._meta.pk.column) 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): def insert_values(self, insert_values, raw_values=False):
""" """