Changeset 5759

Timestamp:

07/25/07 20:44:09 (1 year ago)

Author:

jbronn

Message:

gis: added get_placeholder() routine for the Field class; fixed bug in management _post_create_sql() hook and added _post_delete_sql() hook.

Files:

• django/branches/gis/django/core/management.py (modified) (3 diffs)
• django/branches/gis/django/db/models/base.py (modified) (1 diff)
• django/branches/gis/django/db/models/fields/__init__.py (modified) (1 diff)

django/branches/gis/django/core/management.py

@@ -383 +383 @@
-                    output.append(backend.get_drop_sequence("%s_%s" % (model._meta.db_table, f.column)))
-
+    # Any post deletion needed? (e.g., DropGeometryColumn() in PostGIS)
+    for model in app_models:
+        opts = model._meta
+        for f in opts.fields:
+            if hasattr(f, '_post_delete_sql'):
+                output.append(f._post_delete_sql(style, model._meta.db_table))
-
-    app_label = app_models[0]._meta.app_label
@@ -417 +423 @@
-    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
-    output = []
+
+    # Post-creation SQL should come before any initial SQL data is loaded.
+    for f in opts.fields:
+        if hasattr(f, '_post_create_sql'):
+            output.append(f._post_create_sql(style, model._meta.db_table))
-
-    # Some backends can't execute more than one SQL statement at a time,
@@ -434 +445 @@
-                    output.append(statement + ";")
-            fp.close()
-
-    for f in opts.fields:
-        if hasattr(f, '_post_create_sql'):
-            output.append(f._post_create_sql(style, model._meta.db_table))
-
-    return output

django/branches/gis/django/db/models/base.py

@@ -228 +228 @@
-            field_names = [backend.quote_name(f.column) for f in self._meta.fields if not isinstance(f, AutoField)]
-            db_values = [f.get_db_prep_save(f.pre_save(self, True)) for f in self._meta.fields if not isinstance(f, AutoField)]
+            placeholders = [f.get_placeholder(f.pre_save(self, True)) for f in self._meta.fields if not isinstance(f, AutoField)]
-            # 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(f.pre_save(self, True)) for f in self._meta.fields if isinstance(f, AutoField)]
-placeholders = ['%s'] * len(field_names)
+    placeholders += [f.get_placeholder(f.pre_save(self, True)) for f in self._meta.fields if isinstance(f, AutoField)]
-            if self._meta.order_with_respect_to:
-                field_names.append(backend.quote_name('_order'))

django/branches/gis/django/db/models/fields/__init__.py

@@ -217 +217 @@
-        return [name_prefix + self.name]
-
+    def get_placeholder(self, value):
+        "Returns the placeholder substitution string for the field with the given value."
+        return '%s'
+
-    def prepare_field_objs_and_params(self, manipulator, name_prefix):
-        params = {'validator_list': self.validator_list[:]}