From c08f85fd547a3030cca7ac227e3378d70033e517 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Thu, 22 Oct 2015 14:42:18 +0200
Subject: [PATCH] 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.
---
 .../gis/db/backends/postgis/operations.py     |  2 +-
 docs/releases/1.8.6.txt                       |  3 +++
 tests/gis_tests/geoapp/tests.py               | 16 ++++++++++++-
 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 4d0c2b8865..3830b3f0db 100644
--- a/django/contrib/gis/db/backends/postgis/operations.py
+++ b/django/contrib/gis/db/backends/postgis/operations.py
@@ -73,7 +73,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 0dbf3fa5c5..b4b82b67a0 100644
--- a/tests/gis_tests/geoapp/tests.py
+++ b/tests/gis_tests/geoapp/tests.py
@@ -15,7 +15,7 @@ from django.test import TestCase, ignore_warnings, skipUnlessDBFeature
 from django.utils import six
 from django.utils.deprecation import RemovedInDjango20Warning
 
-from ..utils import no_oracle, oracle, postgis, spatialite
+from ..utils import no_oracle, oracle, postgis, skipUnlessGISLookup, spatialite
 from .models import (
     City, Country, Feature, MinusOneSRID, NonConcreteModel, PennsylvaniaCity,
     State, Track,
@@ -349,6 +349,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