Skip to content

Update for GeoDjango support #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions queryset_transform/__init__.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from django.db import models

class TransformQuerySet(models.query.QuerySet):
class TransformQuerySetMixin(object):
def __init__(self, *args, **kwargs):
super(TransformQuerySet, self).__init__(*args, **kwargs)
super(TransformQuerySetMixin, self).__init__(*args, **kwargs)
self._transform_fns = []

def _clone(self, klass=None, setup=False, **kw):
c = super(TransformQuerySet, self)._clone(klass, setup, **kw)
c = super(TransformQuerySetMixin, self)._clone(klass, setup, **kw)
c._transform_fns = self._transform_fns[:]
return c

Expand All @@ -16,15 +16,19 @@ def transform(self, fn):
return c

def iterator(self):
result_iter = super(TransformQuerySet, self).iterator()
result_iter = super(TransformQuerySetMixin, self).iterator()
if self._transform_fns:
results = list(result_iter)
for fn in self._transform_fns:
fn(results)
return iter(results)
return result_iter

class TransformManager(models.Manager):

class TransformQuerySet(TransformQuerySetMixin, models.query.QuerySet):
pass


class TransformManager(models.Manager):
def get_query_set(self):
return TransformQuerySet(self.model)
13 changes: 13 additions & 0 deletions queryset_transform/geo.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from django.contrib.gis.db.models.manager import GeoManager
from django.contrib.gis.db.models.query import GeoQuerySet

from . import TransformQuerySetMixin


class GeoTransformQuerySet(TransformQuerySetMixin, GeoQuerySet):
pass


class GeoTransformManager(GeoManager):
def get_query_set(self):
return GeoTransformQuerySet(self.model)