Fixed #28437 -- Added support of complex geometry expressions in GIS lookups. #8813
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timgraham
reviewed
Jul 27, 2017
| self.assertTrue(lookups, 'No lookups found') | ||
| for lookup in lookups: | ||
| with self.subTest(lookup): | ||
| City.objects.filter(**{'point__' + lookup: functions.Union('point', 'point')}).exists() |
There was a problem hiding this comment.
Union is imported, so you could drop functions.
Is there not assertTrue/False because the results differ among databases?
There was a problem hiding this comment.
That Union is aggregate.
Results differ among lookups, I don't think that it makes much sense to check them.
tests/gis_tests/geoapp/tests.py
Outdated
| @@ -448,6 +448,17 @@ def test_relate_lookup(self): | |||
| self.assertEqual('Texas', Country.objects.get(mpoly__relate=(pnt2, intersects_mask)).name) | |||
| self.assertEqual('Lawrence', City.objects.get(point__relate=(ks.poly, intersects_mask)).name) | |||
|
|
|||
| # With a complex geometry expression | |||
| self.assertFalse(City.objects.exclude(point__relate=(functions.Union('point', 'point'), within_mask))) | |||
There was a problem hiding this comment.
This doesn't pass on Oracle: <QuerySet [<City: Houston>, <City: Dallas>, <City: Oklahoma City>, <City: Wellington>, <City: Pueblo>, <City: Lawrence>, <City: Chicago>, <City: Victoria>]> is not false.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://code.djangoproject.com/ticket/28437