Summary

Normalize the executed Q() in assertQueries to ease comparisons.

Review Request #12357 — Created June 10, 2022 and submitted June 16, 2022, 2:58 p.m.

Information

Owner

chipx86

Repository

Djblets

Branch

release-3.x

Bugs

Depends On

Reviewers

Groups

djblets

People

Description

When calling MyModel.objects.filter(Q(...)), an extra wrapper Q()

sometimes gets generated, resulting in an expression like

Q(Q(field=value)). This is annoying to work with in tests, and feels

wrong.
To avoid this, we now post-process just a bit. If the Q() object

contains only one child, and that child is another Q() object, we just

extract the inner one.

Testing Done

Tested with unit tests that were triggering this behavior.

Commits

Summary	ID
Normalize the executed Q() in assertQueries to ease comparisons. When calling `MyModel.objects.filter(Q(...))`, an extra wrapper `Q()` sometimes gets generated, resulting in an expression like `Q(Q(field=value))`. This is annoying to work with in tests, and feels wrong. To avoid this, we now post-process just a bit. If the `Q()` object contains only one child, and that child is another `Q()` object, we just extract the inner one.	548a41994127d8d4b28b3235e03d0693f2502ac9

Summary

Normalize the executed Q() in assertQueries to ease comparisons.

When calling `MyModel.objects.filter(Q(...))`, an extra wrapper `Q()` sometimes gets generated, resulting in an expression like `Q(Q(field=value))`. This is annoying to work with in tests, and feels wrong. To avoid this, we now post-process just a bit. If the `Q()` object contains only one child, and that child is another `Q()` object, we just extract the inner one.

548a41994127d8d4b28b3235e03d0693f2502ac9

flake8 passed.

JSHint passed.

Ship it!

```
Ship It!
```

Status:: Completed
Change Summary:: Pushed to release-3.x (48e62ff)