Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #757: manually set AutoField values are now respected; also add…

…ed unit test to verify the correct behavior. Thanks, cygnus.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1511 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c28daf228948a04d15f30e5861a659eb8171f73f 1 parent bf0f6ec
Jacob Kaplan-Moss jacobian authored
1  AUTHORS
View
@@ -87,7 +87,6 @@ answer newbie questions, and generally made Django that much better:
wojtek
ye7cakf02@sneakemail.com
-
A big THANK YOU goes to:
Rob Curley and Ralph Gage for letting us open-source Django.
8 django/core/meta/__init__.py
View
@@ -1009,8 +1009,12 @@ def method_save(opts, self):
record_exists = False
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)]
- 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 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)
if opts.order_with_respect_to:
field_names.append(db.db.quote_name('_order'))
# TODO: This assumes the database supports subqueries.
@@ -1020,7 +1024,7 @@ def method_save(opts, self):
cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % \
(db.db.quote_name(opts.db_table), ','.join(field_names),
','.join(placeholders)), db_values)
- if opts.has_auto_field:
+ if opts.has_auto_field and not pk_set:
setattr(self, opts.pk.attname, db.get_last_insert_id(cursor, opts.db_table, opts.pk.column))
db.db.commit()
# Run any post-save hooks.
8 tests/testapp/models/basic.py
View
@@ -157,6 +157,14 @@ class Article(meta.Model):
>>> a8.save()
>>> 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'
+
"""
from django.conf import settings
Please sign in to comment.
Something went wrong with that request. Please try again.