summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorAnssi Kääriäinen <akaariai@gmail.com>2012-11-15 14:23:02 +0200
committerAnssi Kääriäinen <akaariai@gmail.com>2012-11-15 16:11:22 +0200
commit33f1181c31e0ee5bc5e20ca2a8549508de807623 (patch)
tree293c33b2ef672784fca3e9e4d4888314dc124181 /django/db/models/sql
parentdea4214bb5903398b72e96a2fea24baeca8ed9f3 (diff)
[1.5.x] Fixed #19058 -- Fixed Oracle GIS crash
The problem is the same as in #10888 which was reintroduced when bulk_insert was added. Thanks to Jani Tiainen for report, patch and also testing the final patch on Oracle GIS. Backpatch of 92d7f541da8b59520c833b19fbba52d3ecef2428
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/compiler.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 9d59503799..30b9bed8b4 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -905,6 +905,8 @@ class SQLInsertCompiler(SQLCompiler):
[self.placeholder(field, v) for field, v in zip(fields, val)]
for val in values
]
+ # Oracle Spatial needs to remove some values due to #10888
+ params = self.connection.ops.modify_insert_params(placeholders, params)
if self.return_id and self.connection.features.can_return_id_from_insert:
params = params[0]
col = "%s.%s" % (qn(opts.db_table), qn(opts.pk.column))