diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 8b841f6d5e..3f50e951a3 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -484,7 +484,10 @@ class SQLCompiler(object): if obj.low_mark == 0 and obj.high_mark is None and not self.query.distinct_fields: # If there is no slicing in use, then we can safely drop all ordering obj.clear_ordering(True) - return obj.get_compiler(connection=self.connection).as_sql(subquery=True) + nested_sql = obj.get_compiler(connection=self.connection).as_sql(subquery=True) + if nested_sql == ('', ()): + raise EmptyResultSet + return nested_sql def get_default_columns(self, start_alias=None, opts=None, from_parent=None): """ |