Ticket #10888: orcl_null_v1.diff

django/contrib/gis/db/models/sql/subqueries.py

@@ +1 @@
+from django.contrib.gis.db.backend import SpatialBackend
+from django.db.models.query import insert_query
+
+if SpatialBackend.oracle:
+    from django.db import connection
+    from django.db.models.sql.subqueries import InsertQuery
+
+    class GeoInsertQuery(InsertQuery):
+        def insert_values(self, insert_values, raw_values=False):
+            placeholders, values = [], []
+            for field, val in insert_values:
+                if hasattr(field, 'get_placeholder'):
+                    if hasattr(field, 'geom_type') and val is None:
+                        placeholders.append('NULL')
+                    else:
+                        placeholders.append(field.get_placeholder(val))
+                        values.append(val)
+                else:
+                    placeholders.append('%s')
+                    values.append(val)
+                self.columns.append(field.column)
+
+            if raw_values:
+                self.values.extend(values)
+            else:
+                self.params += tuple(values)
+                self.values.extend(placeholders)
+
+    def insert_query(model, values, return_id=False, raw_values=False):
+        query = GeoInsertQuery(model, connection)
+        query.insert_values(values, raw_values)
+        return query.execute_sql(return_id)
+    

django/contrib/gis/db/models/manager.py

@@ -1 +1 @@
 from django.db.models.manager import Manager
 from django.contrib.gis.db.models.query import GeoQuerySet
+from django.contrib.gis.db.models.sql.subqueries import insert_query
 
 class GeoManager(Manager):
     "Overrides Manager to return Geographic QuerySets."
@@ -86 +87 @@
 
     def unionagg(self, *args, **kwargs):
         return self.get_query_set().unionagg(*args, **kwargs)
+
+    def _insert(self, values, **kwargs):
+        return insert_query(self.model, values, **kwargs)