From 3507a3e629b1378a0be8dabf94917426311fe021 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 7 Jun 2010 20:23:38 +0000 Subject: [PATCH] [soc2010/query-refactor] Cleaned up the implementation of compiler's has_results method. git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13335 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/compiler.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index e2788019f3..393efc1b3f 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -664,18 +664,17 @@ class SQLCompiler(object): return columns def has_results(self): - q = self.query.clone() - q.add_extra({'a': 1}, None, None, None, None, None) - q.select = [] - q.select_fields = [] - q.default_cols = False - q.select_related = False - q.set_extra_mask(('a',)) - q.set_aggregate_mask(()) - q.clear_ordering(True) - q.set_limits(high=1) - compiler = q.get_compiler(using=self.using) - return bool(compiler.execute_sql(SINGLE)) + self.query = self.query.clone() + self.query.add_extra({'a': 1}, None, None, None, None, None) + self.query.select = [] + self.query.select_fields = [] + self.query.default_cols = False + self.query.select_related = False + self.query.set_extra_mask(('a',)) + self.query.set_aggregate_mask(()) + self.query.clear_ordering(True) + self.query.set_limits(high=1) + return bool(self.execute_sql(SINGLE)) def results_iter(self): """