innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #29330 -- Fixed crash when pickling BaseExpression. 

Regression in cfff2af02b.
This commit is contained in:
Daniel Miller 2018-04-16 09:10:13 -04:00 committed by Tim Graham
parent 1d5d4867f4
commit 60156750f6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/expressions.py
View File

@ -153,6 +153,11 @@ class BaseExpression:
if output_field is not None: if output_field is not None:
self.output_field = output_field self.output_field = output_field
def __getstate__(self):
state = self.__dict__.copy()
state.pop('convert_value', None)
return state
def get_db_converters(self, connection): def get_db_converters(self, connection):
return ( return (
[] []

6
tests/expressions/tests.py
View File

@ -1,4 +1,5 @@
import datetime import datetime
import pickle
import unittest import unittest
import uuid import uuid
from copy import deepcopy from copy import deepcopy
@ -585,6 +586,11 @@ class BasicExpressionsTests(TestCase):
outer = Company.objects.filter(pk__in=Subquery(inner.values('pk'))) outer = Company.objects.filter(pk__in=Subquery(inner.values('pk')))
self.assertEqual(outer.get().name, 'Test GmbH') self.assertEqual(outer.get().name, 'Test GmbH')
def test_pickle_expression(self):
expr = Value(1, output_field=models.IntegerField())
expr.convert_value # populate cached property
self.assertEqual(pickle.loads(pickle.dumps(expr)), expr)
class IterableLookupInnerExpressionsTests(TestCase): class IterableLookupInnerExpressionsTests(TestCase):
@classmethod @classmethod