diff options
| author | Claude Paroz <claude@2xlibre.net> | 2015-10-22 14:42:18 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2015-10-22 20:35:54 +0200 |
| commit | 244b7c930f6518024b75a8f87e9bf399cfc79f2f (patch) | |
| tree | f05388b8002a1242d5b761fdaa414abe727f03fb | |
| parent | 840e97ab018ef0901fe4731d7502a7e2baf6546b (diff) | |
[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.
| -rw-r--r-- | django/contrib/gis/db/backends/postgis/operations.py | 2 | ||||
| -rw-r--r-- | docs/releases/1.8.6.txt | 3 | ||||
| -rw-r--r-- | tests/gis_tests/geoapp/tests.py | 16 | ||||
| -rw-r--r-- | tests/gis_tests/utils.py | 23 |
4 files changed, 39 insertions, 5 deletions
diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py index e0af0c1ecb..6913533080 100644 --- a/django/contrib/gis/db/backends/postgis/operations.py +++ b/django/contrib/gis/db/backends/postgis/operations.py @@ -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'), diff --git a/docs/releases/1.8.6.txt b/docs/releases/1.8.6.txt index 1c2af01c7d..a17af96380 100644 --- a/docs/releases/1.8.6.txt +++ b/docs/releases/1.8.6.txt @@ -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`). diff --git a/tests/gis_tests/geoapp/tests.py b/tests/gis_tests/geoapp/tests.py index 0ba7dc7712..3472ed094c 100644 --- a/tests/gis_tests/geoapp/tests.py +++ b/tests/gis_tests/geoapp/tests.py @@ -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) diff --git a/tests/gis_tests/utils.py b/tests/gis_tests/utils.py index 3a43f8852b..6eb029c1d5 100644 --- a/tests/gis_tests/utils.py +++ b/tests/gis_tests/utils.py @@ -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 |
