diff options
| -rw-r--r-- | django/db/models/query.py | 5 | ||||
| -rw-r--r-- | tests/queries/tests.py | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 19c9ced23e..31718a3a3b 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -42,6 +42,8 @@ MAX_GET_RESULTS = 21 # The maximum number of items to display in a QuerySet.__repr__ REPR_OUTPUT_SIZE = 20 +PROHIBITED_FILTER_KWARGS = frozenset(["_connector", "_negated"]) + class BaseIterable: def __init__( @@ -1455,6 +1457,9 @@ class QuerySet(AltersData): return clone def _filter_or_exclude_inplace(self, negate, args, kwargs): + if invalid_kwargs := PROHIBITED_FILTER_KWARGS.intersection(kwargs): + invalid_kwargs_str = ", ".join(f"'{k}'" for k in sorted(invalid_kwargs)) + raise TypeError(f"The following kwargs are invalid: {invalid_kwargs_str}") if negate: self._query.add_q(~Q(*args, **kwargs)) else: diff --git a/tests/queries/tests.py b/tests/queries/tests.py index b8488fef75..2290ea29bc 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -4490,6 +4490,14 @@ class TestInvalidValuesRelation(SimpleTestCase): Annotation.objects.filter(tag__in=[123, "abc"]) +class TestInvalidFilterArguments(TestCase): + def test_filter_rejects_invalid_arguments(self): + school = School.objects.create() + msg = "The following kwargs are invalid: '_connector', '_negated'" + with self.assertRaisesMessage(TypeError, msg): + School.objects.filter(pk=school.pk, _negated=True, _connector="evil") + + class TestTicket24605(TestCase): def test_ticket_24605(self): """ |