Context Navigation

Ticket #17339: factor-out-has_results.patch

File factor-out-has_results.patch, 1.4 KB (added by Jonas H., 12 years ago)

e11d846 has_results
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index cebd77f..037d72d 100644

                class SQLCompiler(object):
                 yield row
+    def has_results(self):
+        # This is always executed on a query clone, so we can modify self.query
+        self.query.add_extra({'a': 1}, None, None, None, None, None)
+        self.query.set_extra_mask(('a',))
+        return bool(self.execute_sql(SINGLE))
     def execute_sql(self, result_type=MULTI):
         """
         Run the query against the database and returns the result(s). The

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 4afe288..25b0727 100644

                class Query(object):
     def has_results(self, using):
         q = self.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=using)
         return bool(compiler.execute_sql(SINGLE))
+        return compiler.has_results()
     def combine(self, rhs, connector):
         """