diff options
Diffstat (limited to 'django/db/backends/mysql/compiler.py')
| -rw-r--r-- | django/db/backends/mysql/compiler.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/backends/mysql/compiler.py b/django/db/backends/mysql/compiler.py index 07832f27f0..bd4105ff8e 100644 --- a/django/db/backends/mysql/compiler.py +++ b/django/db/backends/mysql/compiler.py @@ -3,13 +3,13 @@ from django.db.models.sql import compiler class SQLCompiler(compiler.SQLCompiler): def resolve_columns(self, row, fields=()): values = [] - for value, field in map(None, row, fields): + index_extra_select = len(self.query.extra_select.keys()) + for value, field in map(None, row[index_extra_select:], fields): if (field and field.get_internal_type() in ("BooleanField", "NullBooleanField") and value in (0, 1)): value = bool(value) values.append(value) - return tuple(values) - + return row[:index_extra_select] + tuple(values) class SQLInsertCompiler(compiler.SQLInsertCompiler, SQLCompiler): pass |