Commit b9407b26 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Made it possible to pickle DateQuerySets. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent eb85af18

django/db/models/query.py

+9 −10
Original line number Diff line number Diff line
@@ -452,12 +452,8 @@ class QuerySet(object): 
                "'kind' must be one of 'year', 'month' or 'day'."

        assert order in ('ASC', 'DESC'), \

                "'order' must be either 'ASC' or 'DESC'."

        # Let the FieldDoesNotExist exception propagate.

        field = self.model._meta.get_field(field_name, many_to_many=False)

        assert isinstance(field, DateField), "%r isn't a DateField." \

                % field_name

        return self._clone(klass=DateQuerySet, setup=True, _field=field,

                _kind=kind, _order=order)

        return self._clone(klass=DateQuerySet, setup=True,

                _field_name=field_name, _kind=kind, _order=order)



    def none(self):

        """
@@ -721,13 +717,16 @@ class DateQuerySet(QuerySet): 
        """

        self.query = self.query.clone(klass=sql.DateQuery, setup=True)

        self.query.select = []

        self.query.add_date_select(self._field, self._kind, self._order)

        if self._field.null:

            self.query.add_filter(('%s__isnull' % self._field.name, False))

        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))



    def _clone(self, klass=None, setup=False, **kwargs):

        c = super(DateQuerySet, self)._clone(klass, False, **kwargs)

        c._field = self._field

        c._field_name = self._field_name

        c._kind = self._kind

        if setup and hasattr(c, '_setup_query'):

            c._setup_query()

django/db/models/sql/subqueries.py

+17 −0
Original line number Diff line number Diff line
@@ -343,6 +343,23 @@ class DateQuery(Query): 
    date field. This requires some special handling when converting the results

    back to Python objects, so we put it in a separate class.

    """

    def __getstate__(self):

        """

        Special DateQuery-specific pickle handling.

        """

        for elt in self.select:

            if isinstance(elt, Date):

                # Eliminate a method reference that can't be pickled. The

                # __setstate__ method restores this.

                elt.date_sql_func = None

        return super(DateQuery, self).__getstate__()



    def __setstate__(self, obj_dict):

        super(DateQuery, self).__setstate__(obj_dict)

        for elt in self.select:

            if isinstance(elt, Date):

                self.date_sql_func = self.connection.ops.date_trunc_sql



    def results_iter(self):

        """

        Returns an iterator over the results from executing this query.

tests/regressiontests/queries/models.py

+4 −0
Original line number Diff line number Diff line
@@ -897,6 +897,10 @@ Bug #8283 -- Checking that applying filters after a disjunction works correctly. 
>>> (ExtraInfo.objects.filter(info='e2')|ExtraInfo.objects.filter(note=n1)).filter(note=n1)

[<ExtraInfo: e1>]



Pickling of DateQuerySets used to fail

>>> qs = Item.objects.dates('created', 'month')

>>> _ = pickle.loads(pickle.dumps(qs))



"""}



# In Python 2.3, exceptions raised in __len__ are swallowed (Python issue

django/db/models/sql/datastructures.py

+1 −1

File changed.

Contains only whitespace changes.