diff options
| author | manav014 <dpsman13016@gmail.com> | 2020-12-30 07:52:17 +0530 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-12-30 13:11:47 +0100 |
| commit | a9a7421ab83361746549d574ca13438ba93c95fe (patch) | |
| tree | b37af83e6ffa3c9efba803d1bad5a717c32a310b /tests/model_meta | |
| parent | 74fd233b1433da8c68de636172ee1c9c6d1c08c9 (diff) | |
| download | django-a9a7421ab83361746549d574ca13438ba93c95fe.tar.gz | |
Fixed #32294 -- Prevented ManyToManyField's hidden related name collisions between apps.
Diffstat (limited to 'tests/model_meta')
| -rw-r--r-- | tests/model_meta/results.py | 22 | ||||
| -rw-r--r-- | tests/model_meta/tests.py | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/model_meta/results.py b/tests/model_meta/results.py index db8ccf650e..00aae72d60 100644 --- a/tests/model_meta/results.py +++ b/tests/model_meta/results.py @@ -321,7 +321,7 @@ TEST_RESULTS = { 'get_all_related_objects_with_model_hidden_local': { Person: ( ('+', None), - ('_relating_people_hidden_+', None), + ('_model_meta_relating_people_hidden_+', None), ('Person_following_inherited+', None), ('Person_following_inherited+', None), ('Person_friends_inherited+', None), @@ -339,7 +339,7 @@ TEST_RESULTS = { ), ProxyPerson: ( ('+', Person), - ('_relating_people_hidden_+', Person), + ('_model_meta_relating_people_hidden_+', Person), ('Person_following_inherited+', Person), ('Person_following_inherited+', Person), ('Person_friends_inherited+', Person), @@ -357,7 +357,7 @@ TEST_RESULTS = { ), BasePerson: ( ('+', None), - ('_relating_basepeople_hidden_+', None), + ('_model_meta_relating_basepeople_hidden_+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_base+', None), @@ -408,8 +408,8 @@ TEST_RESULTS = { Person: ( ('+', BasePerson), ('+', None), - ('_relating_basepeople_hidden_+', BasePerson), - ('_relating_people_hidden_+', None), + ('_model_meta_relating_basepeople_hidden_+', BasePerson), + ('_model_meta_relating_people_hidden_+', None), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_base+', BasePerson), @@ -446,8 +446,8 @@ TEST_RESULTS = { ProxyPerson: ( ('+', BasePerson), ('+', Person), - ('_relating_basepeople_hidden_+', BasePerson), - ('_relating_people_hidden_+', Person), + ('_model_meta_relating_basepeople_hidden_+', BasePerson), + ('_model_meta_relating_people_hidden_+', Person), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_abstract+', BasePerson), ('BasePerson_following_base+', BasePerson), @@ -483,7 +483,7 @@ TEST_RESULTS = { ), BasePerson: ( ('+', None), - ('_relating_basepeople_hidden_+', None), + ('_model_meta_relating_basepeople_hidden_+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_abstract+', None), ('BasePerson_following_base+', None), @@ -822,7 +822,7 @@ TEST_RESULTS = { ('friends_base_rel_+', None), ('followers_base', None), ('relating_basepeople', None), - ('_relating_basepeople_hidden_+', None), + ('_model_meta_relating_basepeople_hidden_+', None), ), Person: ( ('friends_abstract_rel_+', BasePerson), @@ -830,7 +830,7 @@ TEST_RESULTS = { ('friends_base_rel_+', BasePerson), ('followers_base', BasePerson), ('relating_basepeople', BasePerson), - ('_relating_basepeople_hidden_+', BasePerson), + ('_model_meta_relating_basepeople_hidden_+', BasePerson), ('friends_inherited_rel_+', None), ('followers_concrete', None), ('relating_people', None), @@ -849,7 +849,7 @@ TEST_RESULTS = { 'friends_base_rel_+', 'followers_base', 'relating_basepeople', - '_relating_basepeople_hidden_+', + '_model_meta_relating_basepeople_hidden_+', ], Person: [ 'friends_inherited_rel_+', diff --git a/tests/model_meta/tests.py b/tests/model_meta/tests.py index 32bcfbc9e6..b3d469a903 100644 --- a/tests/model_meta/tests.py +++ b/tests/model_meta/tests.py @@ -257,7 +257,7 @@ class RelationTreeTests(SimpleTestCase): self.assertEqual( sorted(field.related_query_name() for field in BasePerson._meta._relation_tree), sorted([ - '+', '_relating_basepeople_hidden_+', 'BasePerson_following_abstract+', + '+', '_model_meta_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+', |