QuerySetWrapper.exclude()
This commit is contained in:
parent
4ca93dd817
commit
cc8b4510a2
1 changed files with 11 additions and 4 deletions
|
@ -1,5 +1,6 @@
|
||||||
import typing
|
import typing
|
||||||
from collections import deque
|
from collections import deque
|
||||||
|
from itertools import chain
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Manager, Prefetch, Q
|
from django.db.models import Manager, Prefetch, Q
|
||||||
|
@ -270,11 +271,17 @@ class BaseQueryWrapper(BaseWrapper):
|
||||||
result.negated = q.negated
|
result.negated = q.negated
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def _filter(self, *args, **kwargs):
|
||||||
|
return chain(
|
||||||
|
tuple(self._filter_q(q) for q in args),
|
||||||
|
tuple(self._filter_kwarg(name, value) for name, value in kwargs.items())
|
||||||
|
)
|
||||||
|
|
||||||
def filter(self, *args, **kwargs):
|
def filter(self, *args, **kwargs):
|
||||||
return self._wrap_queryset(self.get_queryset().filter(
|
return self._wrap_queryset(self.get_queryset().filter(*self._filter(*args, **kwargs)))
|
||||||
*tuple(self._filter_q(q) for q in args),
|
|
||||||
*tuple(self._filter_kwarg(name, value) for name, value in kwargs.items()),
|
def exclude(self, *args, **kwargs):
|
||||||
))
|
return self._wrap_queryset(self.get_queryset().exclude(*self._filter(*args, **kwargs)))
|
||||||
|
|
||||||
def count(self):
|
def count(self):
|
||||||
return self.get_queryset().count()
|
return self.get_queryset().count()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue