diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2012-02-29 17:46:23 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2012-02-29 17:46:23 +0000 |
| commit | ae640e5ea08809f56be20957895a61168dbfaeca (patch) | |
| tree | 074a9f347cea72aa6b8a8cbae8c7e29b1f375ba1 /django/contrib/gis/db/models/sql/compiler.py | |
| parent | c471cfd67425a6394a6f91bf6e71573e8f482850 (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/compiler.py')
| -rw-r--r-- | django/contrib/gis/db/models/sql/compiler.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py index 93590256b4..07eea32b69 100644 --- a/django/contrib/gis/db/models/sql/compiler.py +++ b/django/contrib/gis/db/models/sql/compiler.py @@ -185,10 +185,9 @@ class GeoSQLCompiler(compiler.SQLCompiler): self.query.extra_select_fields.get(a, None), self.connection) for v, a in izip(row[rn_offset:index_start], aliases)] - - if self.connection.ops.oracle or self.connection.ops.mysql or getattr(self.query, 'geo_values', False): - # We resolve the rest of the columns if we're on MySQL, Oracle or - # if the `geo_values` attribute is defined. + if self.connection.ops.oracle or getattr(self.query, 'geo_values', False): + # We resolve the rest of the columns if we're on Oracle or if + # the `geo_values` attribute is defined. for value, field in map(None, row[index_start:], fields): values.append(self.query.convert_values(value, field, self.connection)) else: |