diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 136732bd0b..eda7fc3b5e 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -1,4 +1,5 @@ import collections +import json import re from functools import partial from itertools import chain @@ -1250,9 +1251,10 @@ class SQLCompiler: result = list(self.execute_sql()) # Some backends return 1 item tuples with strings, and others return # tuples with integers and strings. Flatten them out into strings. + output_formatter = json.dumps if self.query.explain_format == 'json' else str for row in result[0]: if not isinstance(row, str): - yield ' '.join(str(c) for c in row) + yield ' '.join(output_formatter(c) for c in row) else: yield row |