diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 318e6b8707..f3b2b3da41 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -2046,7 +2046,7 @@ class SQLAggregateCompiler(SQLCompiler): elide_empty=self.elide_empty, ).as_sql(with_col_aliases=True) sql = "SELECT %s FROM (%s) subquery" % (sql, inner_query_sql) - params = params + inner_query_params + params += inner_query_params return sql, params diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index c2a71ff589..9735ce10c8 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1531,7 +1531,7 @@ class Query(BaseExpression): ): """Add a Q-object to the current filter.""" connector = q_object.connector - current_negated = current_negated ^ q_object.negated + current_negated ^= q_object.negated branch_negated = branch_negated or q_object.negated target_clause = WhereNode(connector=connector, negated=q_object.negated) joinpromoter = JoinPromoter( |