Changeset 3118

Timestamp:

06/12/06 07:49:14 (2 years ago)

Author:

mtredinnick

Message:

Fixed the empty model saving case so that it retrieves the primary key id. Also
updated the tests to test this case.

Files:

• django/trunk/django/db/models/base.py (modified) (2 diffs)
• django/trunk/tests/modeltests/empty/models.py (modified) (2 diffs)

django/trunk/django/db/models/base.py

@@ -188 +188 @@
-                    (backend.quote_name(self._meta.db_table), ','.join(field_names),
-                    ','.join(placeholders)), db_values)
-                if self._meta.has_auto_field and not pk_set:
-                    setattr(self, self._meta.pk.attname, backend.get_last_insert_id(cursor, self._meta.db_table, self._meta.pk.column))
-            else:
-                # Create a new record with defaults for everything.
@@ -196 +194 @@
-                     backend.quote_name(self._meta.pk.column),
-                     backend.get_pk_default_value()))
+            if self._meta.has_auto_field and not pk_set:
+                setattr(self, self._meta.pk.attname, backend.get_last_insert_id(cursor, self._meta.db_table, self._meta.pk.column))
-        transaction.commit_unless_managed()
-

django/trunk/tests/modeltests/empty/models.py

@@ -13 +13 @@
-API_TESTS = """
->>> m = Empty()
+>>> m.id
->>> m.save()
->>> m2 = Empty()
@@ -18 +19 @@
->>> len(Empty.objects.all())
-2
+>>> m.id is not None
+True
-
-"""