mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-22 18:22:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #13935, added support for using QuerySet.dates across related fields. Thanks to valyagolev for his work on the patch.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-11-04 16:03:05 +00:00
parent 127506aeac
commit abaa3ed4bd
5 changed files with 121 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django/db/models/query.py
View file

@ -7,7 +7,8 @@ from itertools import izip
from django.db import connections, router, transaction, IntegrityError
from django.db.models.aggregates import Aggregate
from django.db.models.fields import DateField
from django.db.models.query_utils import Q, select_related_descend, CollectedObjects, CyclicDependency, deferred_class_factory, InvalidQuery
from django.db.models.query_utils import (Q, select_related_descend,
CollectedObjects, CyclicDependency, deferred_class_factory, InvalidQuery)
from django.db.models import signals, sql
from django.utils.copycompat import deepcopy
@ -998,12 +999,7 @@ class DateQuerySet(QuerySet):
self.query.clear_deferred_loading()
self.query = self.query.clone(klass=sql.DateQuery, setup=True)
self.query.select = []
field = self.model._meta.get_field(self._field_name, many_to_many=False)
assert isinstance(field, DateField), "%r isn't a DateField." \
% field.name
self.query.add_date_select(field, self._kind, self._order)
if field.null:
self.query.add_filter(('%s__isnull' % field.name, False))
self.query.add_date_select(self._field_name, self._kind, self._order)
def _clone(self, klass=None, setup=False, **kwargs):
c = super(DateQuerySet, self)._clone(klass, False, **kwargs)