summaryrefslogtreecommitdiff
path: root/tests/foreign_object
diff options
context:
space:
mode:
authorAlex Hill <alex@hill.net.au>2015-08-03 19:44:13 +1000
committerTim Graham <timograham@gmail.com>2015-08-03 08:27:53 -0400
commitb47e862d3a84dc5cbca84821a3c5586be6b51639 (patch)
treed4bc5bd0d7035a250f28c26aa13827ad29bc1c03 /tests/foreign_object
parent14c1fd0730e2fd5ae5eb1c61dbea2e08582fab65 (diff)
downloaddjango-b47e862d3a84dc5cbca84821a3c5586be6b51639.tar.gz
Added test for ForeignObject.get_extra_descriptor_filter()
Diffstat (limited to 'tests/foreign_object')
-rw-r--r--tests/foreign_object/models.py2
-rw-r--r--tests/foreign_object/tests.py3
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/foreign_object/models.py b/tests/foreign_object/models.py
index 4d47877763..21f8d2439a 100644
--- a/tests/foreign_object/models.py
+++ b/tests/foreign_object/models.py
@@ -146,7 +146,7 @@ class ActiveTranslationField(models.ForeignObject):
def get_extra_restriction(self, where_class, alias, related_alias):
return ColConstraint(alias, 'lang', get_language())
- def get_extra_descriptor_filter(self):
+ def get_extra_descriptor_filter(self, instance):
return {'lang': get_language()}
def contribute_to_class(self, cls, name):
diff --git a/tests/foreign_object/tests.py b/tests/foreign_object/tests.py
index 5c4c0970f3..edb72ced8e 100644
--- a/tests/foreign_object/tests.py
+++ b/tests/foreign_object/tests.py
@@ -319,6 +319,9 @@ class MultiColumnFKTests(TestCase):
at1_fi.save()
at2_en = ArticleTranslation(article=a1, lang='en', title='Title', body='Lalalalala')
at2_en.save()
+
+ self.assertEqual(Article.objects.get(pk=a1.pk).active_translation, at1_fi)
+
with self.assertNumQueries(1):
fetched = Article.objects.select_related('active_translation').get(
active_translation__title='Otsikko')