From 686c5a2f884b0b5f318a6dd6b6ba7d09ff0180f3 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 12 Jun 2006 12:49:14 +0000 Subject: [PATCH] Fixed the empty model saving case so that it retrieves the primary key id. Also updated the tests to test this case. git-svn-id: http://code.djangoproject.com/svn/django/trunk@3118 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/base.py | 4 ++-- tests/modeltests/empty/models.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/django/db/models/base.py b/django/db/models/base.py index 21609afb7e..787dcd026e 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -187,14 +187,14 @@ class Model(object): cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % \ (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. cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % (backend.quote_name(self._meta.db_table), 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() # Run any post-save hooks. diff --git a/tests/modeltests/empty/models.py b/tests/modeltests/empty/models.py index 3befbd55a5..c50878398d 100644 --- a/tests/modeltests/empty/models.py +++ b/tests/modeltests/empty/models.py @@ -12,10 +12,13 @@ class Empty(models.Model): API_TESTS = """ >>> m = Empty() +>>> m.id >>> m.save() >>> m2 = Empty() >>> m2.save() >>> len(Empty.objects.all()) 2 +>>> m.id is not None +True """