queryset-refactor: Changed execute_sql() to not return an iterator in the

non-MULTI cases when there is an empty result set.


git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6860 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/db/models/sql/query.py

@@ -988,7 +988,10 @@ class Query(object):
         try:
             sql, params = self.as_sql()
         except EmptyResultSet:
-            raise StopIteration
+            if result_type == MULTI:
+                raise StopIteration
+            else:
+                return
 
         cursor = self.connection.cursor()
         cursor.execute(sql, params)