Ticket #10839: geoquery_pickle_orcl.diff

django/contrib/gis/db/models/sql/query.py

@@ -32 +32 @@
         self.custom_select = {}
         self.transformed_srid = None
         self.extra_select_fields = {}
+        
+    if SpatialBackend.oracle:
+        def __reduce__(self):
+            if hasattr(GeoQuery, '__getstate__'):
+                assert hasattr(GeoQuery, '__setstate__')
+                data = self.__getstate__()
+            else:
+                data = self.__dict__
+            return (unpickle_query_class, (GeoQuery,), data)
 
     def clone(self, *args, **kwargs):
         obj = super(GeoQuery, self).clone(*args, **kwargs)
@@ -332 +341 @@
             # Otherwise, check by the given field name -- which may be
             # a lookup to a _related_ geographic field.
             return GeoWhereNode._check_geo_field(self.model._meta, field_name)
+            
+if SpatialBackend.oracle:
+    def unpickle_query_class(QueryClass):
+        """
+        Utility function, called by Python's unpickling machinery, that handles
+        unpickling of Oracle Query subclasses.
+        """    
+        return QueryClass.__new__(QueryClass)
+    unpickle_query_class.__safe_for_unpickling__ = True