Commit 2adbe116 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixes #2216 -- Added extra tests for model validity, and cleaned up warning... 

Fixes #2216 -- Added extra tests for model validity, and cleaned up warning messages for existing tests. Models are now invalid if the query string required to access a field (or related object) would clash with the name of another field (or related object). Previous tests only checked the accessor names, not the query string.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent e923ed2a

django/core/management.py

+31 −10
Original line number Diff line number Diff line
@@ -863,18 +863,29 @@ def get_validation_errors(outfile, app=None): 
                    e.add(opts, "'%s' has relation with model %s, which has not been installed" % (f.name, rel_opts.object_name))



                rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()

                rel_query_name = f.related_query_name()

                for r in rel_opts.fields:

                    if r.name == rel_name:

                        e.add(opts, "'%s' accessor name '%s.%s' clashes with another field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                        e.add(opts, "Accessor for field '%s' clashes with field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                    if r.name == rel_query_name:

                        e.add(opts, "Reverse query name for field '%s' clashes with field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                for r in rel_opts.many_to_many:

                    if r.name == rel_name:

                        e.add(opts, "'%s' accessor name '%s.%s' clashes with a m2m field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                        e.add(opts, "Accessor for field '%s' clashes with m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                    if r.name == rel_query_name:

                        e.add(opts, "Reverse query name for field '%s' clashes with m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                for r in rel_opts.get_all_related_many_to_many_objects():

                    if r.get_accessor_name() == rel_name:

                        e.add(opts, "'%s' accessor name '%s.%s' clashes with a related m2m field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                        e.add(opts, "Accessor for field '%s' clashes with related m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                    if r.get_accessor_name() == rel_query_name:

                        e.add(opts, "Reverse query name for field '%s' clashes with related m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                for r in rel_opts.get_all_related_objects():

                    if r.get_accessor_name() == rel_name and r.field is not f:

                        e.add(opts, "'%s' accessor name '%s.%s' clashes with another related field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                    if r.field is not f:

                        if r.get_accessor_name() == rel_name:

                            e.add(opts, "Accessor for field '%s' clashes with related field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                        if r.get_accessor_name() == rel_query_name:

                            e.add(opts, "Reverse query name for field '%s' clashes with related field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))



                

        for i, f in enumerate(opts.many_to_many):

            # Check to see if the related m2m field will clash with any
@@ -884,18 +895,28 @@ def get_validation_errors(outfile, app=None): 
                e.add(opts, "'%s' has m2m relation with model %s, which has not been installed" % (f.name, rel_opts.object_name))



            rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()

            rel_query_name = f.related_query_name()

            for r in rel_opts.fields:

                if r.name == rel_name:

                    e.add(opts, "'%s' m2m accessor name '%s.%s' clashes with another field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                    e.add(opts, "Accessor for m2m field '%s' clashes with field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                if r.name == rel_query_name:

                    e.add(opts, "Reverse query name for m2m field '%s' clashes with field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

            for r in rel_opts.many_to_many:

                if r.name == rel_name:

                    e.add(opts, "'%s' m2m accessor name '%s.%s' clashes with a m2m field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                    e.add(opts, "Accessor for m2m field '%s' clashes with m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

                if r.name == rel_query_name:

                    e.add(opts, "Reverse query name for m2m field '%s' clashes with m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.name, f.name))

            for r in rel_opts.get_all_related_many_to_many_objects():

                if r.get_accessor_name() == rel_name and r.field is not f:

                    e.add(opts, "'%s' m2m accessor name '%s.%s' clashes with a related m2m field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                if r.field is not f:

                    if r.get_accessor_name() == rel_name:

                        e.add(opts, "Accessor for m2m field '%s' clashes with related m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                    if r.get_accessor_name() == rel_query_name:

                        e.add(opts, "Reverse query name for m2m field '%s' clashes with related m2m field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

            for r in rel_opts.get_all_related_objects():

                if r.get_accessor_name() == rel_name:

                    e.add(opts, "'%s' m2m accessor name '%s.%s' clashes with another related field. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                    e.add(opts, "Accessor for m2m field '%s' clashes with related field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))

                if r.get_accessor_name() == rel_query_name:

                    e.add(opts, "Reverse query name for m2m field '%s' clashes with related field '%s.%s'. Add a related_name argument to the definition for '%s'." % (f.name, rel_opts.object_name, r.get_accessor_name(), f.name))



        # Check admin attribute.

        if opts.admin is not None:

tests/modeltests/invalid_models/models.py

+77 −41

File changed.

Preview size limit exceeded, changes collapsed.

tests/modeltests/m2m_recursive/models.py

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
27. Many-to-many relationships between the same two tables



In this example, A Person can have many friends, who are also people. Friendship is a

symmetrical relationshiup - if I am your friend, you are my friend.

symmetrical relationship - if I am your friend, you are my friend.



A person can also have many idols - but while I may idolize you, you may not think

the same of me. 'Idols' is an example of a non-symmetrical m2m field. Only recursive