From 016f12a2c27fd6006d43cc32af734dfd0ea96f98 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 1 Mar 2009 01:59:18 +0000 Subject: [1.0.X] Fixed insert/update handling when no database interaction is required. Fixed #10205 as part of this. Backport of r9926 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9927 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/subqueries.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/db/models/sql/subqueries.py') diff --git a/django/db/models/sql/subqueries.py b/django/db/models/sql/subqueries.py index 39ef439dc9..a84eeabf38 100644 --- a/django/db/models/sql/subqueries.py +++ b/django/db/models/sql/subqueries.py @@ -115,7 +115,7 @@ class UpdateQuery(Query): tables, but their rowcounts are not returned). """ cursor = super(UpdateQuery, self).execute_sql(result_type) - rows = cursor.rowcount + rows = cursor and cursor.rowcount or 0 del cursor for query in self.get_related_updates(): query.execute_sql(result_type) @@ -307,7 +307,7 @@ class InsertQuery(Query): def execute_sql(self, return_id=False): cursor = super(InsertQuery, self).execute_sql(None) - if return_id: + if return_id and cursor: return self.connection.ops.last_insert_id(cursor, self.model._meta.db_table, self.model._meta.pk.column) -- cgit v1.3