summaryrefslogtreecommitdiff
path: root/django/contrib/gis/db/models/sql/query.py
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2012-02-29 17:46:23 +0000
committerRamiro Morales <cramm0@gmail.com>2012-02-29 17:46:23 +0000
commitae640e5ea08809f56be20957895a61168dbfaeca (patch)
tree074a9f347cea72aa6b8a8cbae8c7e29b1f375ba1 /django/contrib/gis/db/models/sql/query.py
parentc471cfd67425a6394a6f91bf6e71573e8f482850 (diff)
Fixed #17796 -- Rolled back [17588] because the fix for the original relatively
corner case (boolean fields under MySQL spatial backend) had a wider scope with potentially unintended consequences affecting the main MySQL backend and the required changes wouldn't be appropiate at this point of the 1.4 development cycle. Refs #15169. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/contrib/gis/db/models/sql/query.py')
-rw-r--r--django/contrib/gis/db/models/sql/query.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py
index 25c0376996..c300dcd527 100644
--- a/django/contrib/gis/db/models/sql/query.py
+++ b/django/contrib/gis/db/models/sql/query.py
@@ -56,8 +56,8 @@ class GeoQuery(sql.Query):
extra selection objects into Geometry and Distance objects.
TODO: Make converted objects 'lazy' for less overhead.
"""
- if connection.ops.oracle or connection.ops.mysql:
- # On MySQL and Oracle, call their version of `convert_values` first.
+ if connection.ops.oracle:
+ # Running through Oracle's first.
value = super(GeoQuery, self).convert_values(value, field or GeomField(), connection)
if value is None: