summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/compiler.py14
-rw-r--r--django/db/models/sql/query.py14
2 files changed, 14 insertions, 14 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 2877171fd2..e2788019f3 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -662,6 +662,20 @@ class SQLCompiler(object):
columns = {}
self.query.deferred_to_data(columns, self.query.deferred_to_columns_cb)
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))
def results_iter(self):
"""
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 0913399e2a..02d13bd7a9 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -402,20 +402,6 @@ class Query(object):
return number
- 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))
-
def combine(self, rhs, connector):
"""
Merge the 'rhs' query into the current one (with any 'rhs' effects