test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #19527 -- Fixed SQL compiler regression causing Oracle failure.

This commit is contained in:
Tim Graham 2016-03-05 14:02:35 -05:00
parent 1845bc1d10
commit 359be4460e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1024,14 +1024,14 @@ class SQLInsertCompiler(SQLCompiler):
params = param_rows params = param_rows
else: else:
result.append("VALUES (%s)" % ", ".join(placeholder_rows[0])) result.append("VALUES (%s)" % ", ".join(placeholder_rows[0]))
params = param_rows[0] params = [param_rows[0]]
col = "%s.%s" % (qn(opts.db_table), qn(opts.pk.column)) col = "%s.%s" % (qn(opts.db_table), qn(opts.pk.column))
r_fmt, r_params = self.connection.ops.return_insert_id() r_fmt, r_params = self.connection.ops.return_insert_id()
# Skip empty r_fmt to allow subclasses to customize behavior for # Skip empty r_fmt to allow subclasses to customize behavior for
# 3rd party backends. Refs #19096. # 3rd party backends. Refs #19096.
if r_fmt: if r_fmt:
result.append(r_fmt % col) result.append(r_fmt % col)
params += r_params params += [r_params]
return [(" ".join(result), tuple(chain.from_iterable(params)))] return [(" ".join(result), tuple(chain.from_iterable(params)))]
if can_bulk: if can_bulk: