innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #24611 -- Fixed update() crash with related UUID pk object.

This commit is contained in:
Jay Wineinger 2015-04-09 13:47:05 -05:00 committed by Tim Graham
parent 872eb26f54
commit 923da0274a
4 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -314,6 +314,7 @@ answer newbie questions, and generally made Django that much better:
Jason Yan <tailofthesun@gmail.com> Jason Yan <tailofthesun@gmail.com>
Javier Mansilla <javimansilla@gmail.com> Javier Mansilla <javimansilla@gmail.com>
Jay Parlar <parlar@gmail.com> Jay Parlar <parlar@gmail.com>
Jay Wineinger <jay.wineinger@gmail.com>
J. Clifford Dyer <jcd@sdf.lonestar.org> J. Clifford Dyer <jcd@sdf.lonestar.org>
jcrasta@gmail.com jcrasta@gmail.com
jdetaeye jdetaeye

5
django/db/models/sql/compiler.py
View File

@ -1012,7 +1012,10 @@ class SQLUpdateCompiler(SQLCompiler):
raise FieldError("Aggregate functions are not allowed in this query") raise FieldError("Aggregate functions are not allowed in this query")
elif hasattr(val, 'prepare_database_save'): elif hasattr(val, 'prepare_database_save'):
if field.remote_field: if field.remote_field:
val = val.prepare_database_save(field) val = field.get_db_prep_save(
val.prepare_database_save(field),
connection=self.connection,
)
else: else:
raise TypeError("Database is trying to update a relational field " raise TypeError("Database is trying to update a relational field "
"of type %s with a value of type %s. Make sure " "of type %s with a value of type %s. Make sure "

3
docs/releases/1.8.1.txt
View File

@ -38,3 +38,6 @@ Bugfixes
* Prevented arbitrary file inclusions in :mod:`~django.contrib.admindocs` * Prevented arbitrary file inclusions in :mod:`~django.contrib.admindocs`
(:ticket:`24625`). (:ticket:`24625`).
* Fixed a crash with ``QuerySet.update()`` on foreign keys to instances with
``uuid`` primary keys (:ticket:`24611`).

17
tests/model_fields/test_uuid.py
View File

@ -129,3 +129,20 @@ class TestAsPrimaryKey(TestCase):
RelatedToUUIDModel.objects.create(uuid_fk=pk_model) RelatedToUUIDModel.objects.create(uuid_fk=pk_model)
related = RelatedToUUIDModel.objects.get() related = RelatedToUUIDModel.objects.get()
self.assertEqual(related.uuid_fk.pk, related.uuid_fk_id) self.assertEqual(related.uuid_fk.pk, related.uuid_fk_id)
def test_update_with_related_model_instance(self):
# regression for #24611
u1 = PrimaryKeyUUIDModel.objects.create()
u2 = PrimaryKeyUUIDModel.objects.create()
r = RelatedToUUIDModel.objects.create(uuid_fk=u1)
RelatedToUUIDModel.objects.update(uuid_fk=u2)
r.refresh_from_db()
self.assertEqual(r.uuid_fk, u2)
def test_update_with_related_model_id(self):
u1 = PrimaryKeyUUIDModel.objects.create()
u2 = PrimaryKeyUUIDModel.objects.create()
r = RelatedToUUIDModel.objects.create(uuid_fk=u1)
RelatedToUUIDModel.objects.update(uuid_fk=u2.pk)
r.refresh_from_db()
self.assertEqual(r.uuid_fk, u2)