[1.8.x] Fixed #25592 -- Fixed misnamed strictly_above PostGIS lookup

Fixes a regression from 2bd1bbc42. Thanks Daniel Wiesmann for the report
and Tim Graham for the review.
Backport of c08f85fd54 from master.
This commit is contained in:
Claude Paroz 2015-10-22 14:42:18 +02:00
parent 840e97ab01
commit 244b7c930f
4 changed files with 39 additions and 5 deletions

View File

@ -67,7 +67,7 @@ class PostGISOperations(BaseSpatialOperations, DatabaseOperations):
'left': PostGISOperator(op='<<'),
'right': PostGISOperator(op='>>'),
'strictly_below': PostGISOperator(op='<<|'),
'stricly_above': PostGISOperator(op='|>>'),
'strictly_above': PostGISOperator(op='|>>'),
'same_as': PostGISOperator(op='~='),
'exact': PostGISOperator(op='~='), # alias of same_as
'contains_properly': PostGISOperator(func='ST_ContainsProperly'),

View File

@ -34,3 +34,6 @@ Bugfixes
and retrieval (:ticket:`25563`). This prevents any models generated in data
migrations using ``QuerySet.defer()`` from leaking to test and application
code.
* Fixed a typo in the name of the `strictly_above` PostGIS lookup
(:ticket:`25592`).

View File

@ -11,7 +11,7 @@ from django.test import TestCase, ignore_warnings, skipUnlessDBFeature
from django.utils import six
from django.utils.deprecation import RemovedInDjango110Warning
from ..utils import no_oracle, oracle, postgis, spatialite
from ..utils import no_oracle, oracle, postgis, skipUnlessGISLookup, spatialite
if HAS_GEOS:
from django.contrib.gis.db.models import Extent, MakeLine, Union
@ -347,6 +347,20 @@ class GeoLookupTest(TestCase):
for c in qs:
self.assertIn(c.name, cities)
@skipUnlessGISLookup("strictly_above", "strictly_below")
def test_strictly_above_below_lookups(self):
dallas = City.objects.get(name='Dallas')
self.assertQuerysetEqual(
City.objects.filter(point__strictly_above=dallas.point).order_by('name'),
['Chicago', 'Lawrence', 'Oklahoma City', 'Pueblo', 'Victoria'],
lambda b: b.name
)
self.assertQuerysetEqual(
City.objects.filter(point__strictly_below=dallas.point).order_by('name'),
['Houston', 'Wellington'],
lambda b: b.name
)
def test_equals_lookups(self):
"Testing the 'same_as' and 'equals' lookup types."
pnt = fromstr('POINT (-95.363151 29.763374)', srid=4326)

View File

@ -1,13 +1,30 @@
from unittest import skip
import unittest
from functools import wraps
from django.conf import settings
from django.db import DEFAULT_DB_ALIAS
from django.db import DEFAULT_DB_ALIAS, connection
def skipUnlessGISLookup(*gis_lookups):
"""
Skip a test unless a database supports all of gis_lookups.
"""
def decorator(test_func):
@wraps(test_func)
def skip_wrapper(*args, **kwargs):
if any(key not in connection.ops.gis_operators for key in gis_lookups):
raise unittest.SkipTest(
"Database doesn't support all the lookups: %s" % ", ".join(gis_lookups)
)
return test_func(*args, **kwargs)
return skip_wrapper
return decorator
def no_backend(test_func, backend):
"Use this decorator to disable test on specified backend."
if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'].rsplit('.')[-1] == backend:
@skip("This test is skipped on '%s' backend" % backend)
@unittest.skip("This test is skipped on '%s' backend" % backend)
def inner():
pass
return inner