Changeset 1511

Timestamp:

11/30/05 21:06:30 (3 years ago)

Author:

jacob

Message:

Fixed #757: manually set AutoField? values are now respected; also added unit test to verify the correct behavior. Thanks, cygnus.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/meta/__init__.py (modified) (2 diffs)
• django/trunk/tests/testapp/models/basic.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -88 +88 @@
-    ye7cakf02@sneakemail.com
-
-
-A big THANK YOU goes to:
-

django/trunk/django/core/meta/__init__.py

@@ -1010 +1010 @@
-    if not pk_set or not record_exists:
-        field_names = [db.db.quote_name(f.column) for f in opts.fields if not isinstance(f, AutoField)]
+        db_values = [f.get_db_prep_save(f.pre_save(getattr(self, f.attname), True)) for f in opts.fields if not isinstance(f, AutoField)]
+        # If the PK has been manually set we must respect that
+        if pk_set:
+            field_names += [f.column for f in opts.fields if isinstance(f, AutoField)]
+            db_values += [f.get_db_prep_save(f.pre_save(getattr(self, f.column), True)) for f in opts.fields if isinstance(f, AutoField)]
-        placeholders = ['%s'] * len(field_names)
-        db_values = [f.get_db_prep_save(f.pre_save(getattr(self, f.attname), True)) for f in opts.fields if not isinstance(f, AutoField)]
-        if opts.order_with_respect_to:
-            field_names.append(db.db.quote_name('_order'))
@@ -1021 +1025 @@
-            (db.db.quote_name(opts.db_table), ','.join(field_names),
-            ','.join(placeholders)), db_values)
-
+ and not pk_set
-            setattr(self, opts.pk.attname, db.get_last_insert_id(cursor, opts.db_table, opts.pk.column))
-    db.db.commit()

django/trunk/tests/testapp/models/basic.py

@@ -158 +158 @@
->>> a8.id
-8L
+
+# You can manually specify the primary key when creating a new objet
+>>> a101 = articles.Article(id=101, headline='Article 101', pub_date=datetime(2005, 7, 31, 12, 30, 45))
+>>> a101.save()
+>>> a101 = articles.get_object(pk=101)
+>>> a101.headline
+'Article 101'
+
-"""
-