mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 06:36:07 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #15040 - Boolean fields return 0 and 1 when loaded through select_related

Browse Source 
Thanks to homm for the report and ramiro for the patch.
This commit is contained in:
Luke Plant
2012-10-26 00:25:59 +01:00
parent 5c143cb340
commit f3a2bcdee9
3 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/models/sql/compiler.py
View File

@@ -774,10 +774,20 @@ class SQLCompiler(object):
# We only set this up here because
# related_select_fields isn't populated until
# execute_sql() has been called.
# We also include types of fields of related models that
# will be included via select_related() for the benefit
# of MySQL/MySQLdb when boolean fields are involved
# (#15040).
# This code duplicates the logic for the order of fields
# found in get_columns(). It would be nice to clean this up.
if self.query.select_fields:
fields = self.query.select_fields + self.query.related_select_fields
fields = self.query.select_fields
else:
fields = self.query.model._meta.fields
fields = fields + self.query.related_select_fields
# If the field was deferred, exclude it from being passed
# into `resolve_columns` because it wasn't selected.
only_load = self.deferred_to_columns()