diff options
| author | Andriy Sokolovskiy <me@asokolovskiy.com> | 2015-05-09 13:57:13 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-13 04:17:50 -0700 |
| commit | eb85e6672aeb00c67a3666785965edeceed976af (patch) | |
| tree | ebcf5ce3b942a69ce535b152a6fdcab9e521da99 /tests/model_meta | |
| parent | 15359f1fe9b032311fbb0e9bb2d1bb7c86ea855c (diff) | |
[1.8.x] Fixed #24156 -- Fixed inherited related name of ManyToManyField.
Fixed situation when parent abstract model declares related_name='+'
and child models had an invalid queryset.
Backport of f7b297815819153b53dc1125d3f42869fb1b7ebc from master
Diffstat (limited to 'tests/model_meta')
| -rw-r--r-- | tests/model_meta/results.py | 20 | ||||
| -rw-r--r-- | tests/model_meta/tests.py | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/model_meta/results.py b/tests/model_meta/results.py index 858b70b73a..203dd52638 100644 --- a/tests/model_meta/results.py +++ b/tests/model_meta/results.py @@ -319,7 +319,7 @@ TEST_RESULTS = { 'get_all_related_objects_with_model_hidden_local': { Person: ( ('+', None), - ('_people_hidden_+', None), + ('_relating_people_hidden_+', None), ('Person_following_inherited+', None), ('Person_following_inherited+', None), ('Person_friends_inherited+', None), @@ -334,7 +334,7 @@ TEST_RESULTS = { ), BasePerson: ( ('+', None), - ('_basepeople_hidden_+', None), + ('_relating_basepeople_hidden_+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_base+', None), @@ -382,8 +382,8 @@ TEST_RESULTS = { Person: ( ('+', BasePerson), ('+', None), - ('_basepeople_hidden_+', BasePerson), - ('_people_hidden_+', None), + ('_relating_basepeople_hidden_+', BasePerson), + ('_relating_people_hidden_+', None), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_base+', BasePerson), @@ -416,7 +416,7 @@ TEST_RESULTS = { ), BasePerson: ( ('+', None), - ('_basepeople_hidden_+', None), + ('_relating_basepeople_hidden_+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_base+', None), @@ -730,7 +730,7 @@ TEST_RESULTS = { ('friends_base_rel_+', None), ('followers_base', None), ('relating_basepeople', None), - ('_basepeople_hidden_+', None), + ('_relating_basepeople_hidden_+', None), ), Person: ( ('friends_abstract_rel_+', BasePerson), @@ -738,11 +738,11 @@ TEST_RESULTS = { ('friends_base_rel_+', BasePerson), ('followers_base', BasePerson), ('relating_basepeople', BasePerson), - ('_basepeople_hidden_+', BasePerson), + ('_relating_basepeople_hidden_+', BasePerson), ('friends_inherited_rel_+', None), ('followers_concrete', None), ('relating_people', None), - ('_people_hidden_+', None), + ('_relating_people_hidden_+', None), ), Relation: ( ('m2m_abstract_rel', None), @@ -757,13 +757,13 @@ TEST_RESULTS = { 'friends_base_rel_+', 'followers_base', 'relating_basepeople', - '_basepeople_hidden_+', + '_relating_basepeople_hidden_+', ], Person: [ 'friends_inherited_rel_+', 'followers_concrete', 'relating_people', - '_people_hidden_+', + '_relating_people_hidden_+', ], Relation: [ 'm2m_abstract_rel', diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py index 6db9a0f710..ba132b8eba 100644 --- a/tests/model_meta/tests.py +++ b/tests/model_meta/tests.py @@ -237,7 +237,7 @@ class RelationTreeTests(TestCase): self.assertEqual( sorted([field.related_query_name() for field in BasePerson._meta._relation_tree]), sorted([ - '+', '_basepeople_hidden_+', 'BasePerson_following_abstract+', 'BasePerson_following_abstract+', + '+', '_relating_basepeople_hidden_+', 'BasePerson_following_abstract+', 'BasePerson_following_abstract+', 'BasePerson_following_base+', 'BasePerson_following_base+', 'BasePerson_friends_abstract+', 'BasePerson_friends_abstract+', 'BasePerson_friends_base+', 'BasePerson_friends_base+', 'BasePerson_m2m_abstract+', 'BasePerson_m2m_base+', 'Relating_basepeople+', |