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

Fixed #26620 -- Made Model.refresh_from_db() fail when passed unknown kwargs.

This commit is contained in:
Marti Raudsepp 2016-05-16 21:49:03 +03:00 committed by Tim Graham
parent a5c8072ab1
commit b9ae662c97
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -646,7 +646,7 @@ class Model(six.with_metaclass(ModelBase)):
if f.attname not in self.__dict__ if f.attname not in self.__dict__
} }
def refresh_from_db(self, using=None, fields=None, **kwargs): def refresh_from_db(self, using=None, fields=None):
""" """
Reloads field values from the database. Reloads field values from the database.

2
docs/ref/models/instances.txt
View File

@ -128,7 +128,7 @@ in the ``from_db()`` method.
Refreshing objects from database Refreshing objects from database
================================ ================================
.. method:: Model.refresh_from_db(using=None, fields=None, **kwargs) .. method:: Model.refresh_from_db(using=None, fields=None)
If you need to reload a model's values from the database, you can use the If you need to reload a model's values from the database, you can use the
``refresh_from_db()`` method. When this method is called without arguments the ``refresh_from_db()`` method. When this method is called without arguments the

5
tests/basic/tests.py
View File

@ -690,6 +690,11 @@ class ModelRefreshTests(TestCase):
a.refresh_from_db() a.refresh_from_db()
self.assertEqual(a.pub_date, new_pub_date) self.assertEqual(a.pub_date, new_pub_date)
def test_unknown_kwarg(self):
s = SelfRef.objects.create()
with self.assertRaises(TypeError):
s.refresh_from_db(unknown_kwarg=10)
def test_refresh_fk(self): def test_refresh_fk(self):
s1 = SelfRef.objects.create() s1 = SelfRef.objects.create()
s2 = SelfRef.objects.create() s2 = SelfRef.objects.create()