Ticket #2417: 11_z2_sql_placeholder_prefix.diff

django/db/models/base.py

@@ -241 +241 @@
             else:
                 record_exists = False
         if not pk_set or not record_exists:
-            field_names = [qn(f.column) for f in self._meta.fields if not isinstance(f, AutoField)]
-            db_values = [f.get_db_prep_save(raw and getattr(self, f.attname) or f.pre_save(self, True)) for f in self._meta.fields if not isinstance(f, AutoField)]
+            field_names = []
+            db_values = []
+            placeholders = []
+            for f in self._meta.fields:
+                if not isinstance(f, AutoField):
+                    field_names += [ qn(f.column) ]
+                    val = f.get_db_prep_save(raw and getattr(self, f.attname) or f.pre_save(self, True))
+                    db_values += [ val ]
+                    placeholders += [ (f.get_db_value_placeholder_prefix(val) or '') + '%s' + (f.get_db_value_placeholder_postfix(val) or '') ]
             # If the PK has been manually set, respect that.
             if pk_set:
-                field_names += [f.column for f in self._meta.fields if isinstance(f, AutoField)]
-                db_values += [f.get_db_prep_save(raw and getattr(self, f.attname) or f.pre_save(self, True)) for f in self._meta.fields if isinstance(f, AutoField)]
-            placeholders = ['%s'] * len(field_names)
+                for f in self._meta.fields:
+                    if isinstance(f, AutoField):
+                        field_names += [ f.column ]
+                        val = f.get_db_prep_save(raw and getattr(self, f.attname) or f.pre_save(self, True))
+                        db_values += [ val ]
+                        placeholders += [ (f.get_db_value_placeholder_prefix(val) or '') + '%s' + (f.get_db_value_placeholder_postfix(val) or '') ]
+
             if self._meta.order_with_respect_to:
                 field_names.append(qn('_order'))
                 placeholders.append('%s')

django/db/models/fields/__init__.py

@@ -207 +207 @@
         "Returns field's value prepared for saving into a database."
         return value