p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Malcolm Tredinnick 2006-06-12 12:49:14 +00:00
parent bff39bfb8c
commit 686c5a2f88
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/models/base.py
View File

@ -187,14 +187,14 @@ class Model(object):
cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % \ cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % \
(backend.quote_name(self._meta.db_table), ','.join(field_names), (backend.quote_name(self._meta.db_table), ','.join(field_names),
','.join(placeholders)), db_values) ','.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: else:
# Create a new record with defaults for everything. # Create a new record with defaults for everything.
cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % cursor.execute("INSERT INTO %s (%s) VALUES (%s)" %
(backend.quote_name(self._meta.db_table), (backend.quote_name(self._meta.db_table),
backend.quote_name(self._meta.pk.column), backend.quote_name(self._meta.pk.column),
backend.get_pk_default_value())) 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() transaction.commit_unless_managed()
# Run any post-save hooks. # Run any post-save hooks.

3
tests/modeltests/empty/models.py
View File

@ -12,10 +12,13 @@ class Empty(models.Model):
API_TESTS = """ API_TESTS = """
>>> m = Empty() >>> m = Empty()
>>> m.id
>>> m.save() >>> m.save()
>>> m2 = Empty() >>> m2 = Empty()
>>> m2.save() >>> m2.save()
>>> len(Empty.objects.all()) >>> len(Empty.objects.all())
2 2
>>> m.id is not None
True
""" """