diff options
Diffstat (limited to 'django/db/models/sql/compiler.py')
| -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 96d10b9eda..27310e5d9f 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -160,7 +160,10 @@ class SQLCompiler: expressions = self.collapse_group_by(expressions, having_group_by) for expr in expressions: - sql, params = self.compile(expr) + try: + sql, params = self.compile(expr) + except EmptyResultSet: + continue sql, params = expr.select_format(self, sql, params) params_hash = make_hashable(params) if (sql, params_hash) not in seen: |