Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.0.X] Fixed #10839 -- `GeoQuery` now unpickles properly on Oracle.

Backport of r10615 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 725ffa57bb33c45956ec11f14eae997cf9607bc2 1 parent f110f91
@jbronn jbronn authored
View
16 django/contrib/gis/db/models/sql/query.py
@@ -30,6 +30,13 @@ def __init__(self, model, conn):
self.transformed_srid = None
self.extra_select_fields = {}
+ if SpatialBackend.oracle:
+ # Have to override this so that GeoQuery, instead of OracleQuery,
+ # is returned when unpickling.
+ def __reduce__(self):
+ callable, args, data = super(GeoQuery, self).__reduce__()
+ return (unpickle_geoquery, (), data)
+
def clone(self, *args, **kwargs):
obj = super(GeoQuery, self).clone(*args, **kwargs)
# Customized selection dictionary and transformed srid flag have
@@ -324,6 +331,15 @@ def _geo_field(self, field_name=None):
# a lookup to a _related_ geographic field.
return self._check_geo_field(self.model, field_name)
+if SpatialBackend.oracle:
+ def unpickle_geoquery():
+ """
+ Utility function, called by Python's unpickling machinery, that handles
+ unpickling of GeoQuery subclasses of OracleQuery.
+ """
+ return GeoQuery.__new__(GeoQuery)
+ unpickle_geoquery.__safe_for_unpickling__ = True
+
### Field Classes for `convert_values` ####
class BaseField(object):
def get_internal_type(self):
View
9 django/contrib/gis/tests/relatedapp/tests.py
@@ -137,6 +137,15 @@ def test09_pk_relations(self):
self.assertEqual(val_dict['id'], c_id)
self.assertEqual(val_dict['location__id'], l_id)
+ def test11_geoquery_pickle(self):
+ "Ensuring GeoQuery objects are unpickled correctly. See #10839."
+ import pickle
+ from django.contrib.gis.db.models.sql import GeoQuery
+ qs = City.objects.all()
+ q_str = pickle.dumps(qs.query)
+ q = pickle.loads(q_str)
+ self.assertEqual(GeoQuery, q.__class__)
+
# TODO: Related tests for KML, GML, and distance lookups.
def suite():

0 comments on commit 725ffa5

Please sign in to comment.
Something went wrong with that request. Please try again.