Summary

Update query catching and comparison for Django 4.2.

Review Request #13453 — Created Dec. 7, 2023 and submitted Dec. 8, 2023, 11:19 p.m.

Information

Owner

chipx86

Repository

Djblets

Branch

release-5.x

Bugs

Depends On

Reviewers

Groups

djblets

People

Description

The new query catching and comparison code introduced in Djblets 3.4
wasn't quite compatible with Django 4.2, due to some changes in how some
queries and Q-expressions are built.

COUNT(*) queries are now generated slightly differently, with
different internals, affecting query expectations. This has been
updated in Djblets's tests, but this will impact consumers of query
comparison code outside of Djblets as well.

SQLite query syntax has changed for some operations, affecting Djblets
unit tests.

~Q(...) negated expressions are now represented differently
internally, using a NegatedExpression (a subclass of
ExpressionWrapper). These are now supported, serialized, represented,
and compared correctly.

Testing Done

Unit tests pass.

Commits

Summary	ID
Update query catching and comparison for Django 4.2. The new query catching and comparison code introduced in Djblets 3.4 wasn't quite compatible with Django 4.2, due to some changes in how some queries and Q-expressions are built. `COUNT(*)` queries are now generated slightly differently, with different internals, affecting query expectations. This has been updated in Djblets's tests, but this will impact consumers of query comparison code outside of Djblets as well. SQLite query syntax has changed for some operations, affecting Djblets unit tests. `~Q(...)` negated expressions are now represented differently internally, using a `NegatedExpression` (a subclass of `ExpressionWrapper`). These are now supported, serialized, represented, and compared correctly.	cb23421cda3dc081c972e368c29ae06617ed49bb

Summary

Update query catching and comparison for Django 4.2.

The new query catching and comparison code introduced in Djblets 3.4 wasn't quite compatible with Django 4.2, due to some changes in how some queries and Q-expressions are built. `COUNT(*)` queries are now generated slightly differently, with different internals, affecting query expectations. This has been updated in Djblets's tests, but this will impact consumers of query comparison code outside of Djblets as well. SQLite query syntax has changed for some operations, affecting Djblets unit tests. `~Q(...)` negated expressions are now represented differently internally, using a `NegatedExpression` (a subclass of `ExpressionWrapper`). These are now supported, serialized, represented, and compared correctly.

cb23421cda3dc081c972e368c29ae06617ed49bb

Issues

Description	From	Last Updated
'django.db.models.expressions.ExpressionWrapper' imported but unused Column: 1 Error code: F401	reviewbot	Dec. 7, 2023, 11:45 p.m.

flake8 failed.

JSHint passed.

flake8

djblets/db/query_comparator.py (Diff revision 1)

The issue has been resolved. Show all issues

'django.db.models.expressions.ExpressionWrapper' imported but unused

Column: 1
Error code: F401

Change Summary:

Removed an unused import.

Commits:

	Summary	ID
	Update query catching and comparison for Django 4.2. The new query catching and comparison code introduced in Djblets 3.4 wasn't quite compatible with Django 4.2, due to some changes in how some queries and Q-expressions are built. `COUNT(*)` queries are now generated slightly differently, with different internals, affecting query expectations. This has been updated in Djblets's tests, but this will impact consumers of query comparison code outside of Djblets as well. SQLite query syntax has changed for some operations, affecting Djblets unit tests. `~Q(...)` negated expressions are now represented differently internally, using a `NegatedExpression` (a subclass of `ExpressionWrapper`). These are now supported, serialized, represented, and compared correctly.	7c88dfd9652e2f4070e775600dc574f82d5d6648
	Update query catching and comparison for Django 4.2. The new query catching and comparison code introduced in Djblets 3.4 wasn't quite compatible with Django 4.2, due to some changes in how some queries and Q-expressions are built. `COUNT(*)` queries are now generated slightly differently, with different internals, affecting query expectations. This has been updated in Djblets's tests, but this will impact consumers of query comparison code outside of Djblets as well. SQLite query syntax has changed for some operations, affecting Djblets unit tests. `~Q(...)` negated expressions are now represented differently internally, using a `NegatedExpression` (a subclass of `ExpressionWrapper`). These are now supported, serialized, represented, and compared correctly.	cb23421cda3dc081c972e368c29ae06617ed49bb

Diff:

Revision 2 (+184 -78)

Show changes

	djblets/db/query_catcher.py
	djblets/db/query_comparator.py
	djblets/db/tests/test_query_catcher.py
	djblets/db/tests/test_query_comparator.py

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

Status: Closed (submitted)

Change Summary:

Pushed to release-5.x (01a7f23)