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

[1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m relations... 

[1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m relations between two models with the same class name. Thanks to pkoch for the report, and to Ramiro Morales for the patch.

Backport of r12489 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6ca3154b

django/core/management/validation.py

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ def get_validation_errors(outfile, app=None): 
                            elif field.rel.to == cls:

                                seen_this_fk = True

                    if not seen_related_fk or not seen_this_fk:

                        e.add(opts, "'%s' has a manually-defined m2m relation through model %s, which does not have foreign keys to %s and %s" % (f.name, f.rel.through, f.rel.to._meta.object_name, cls._meta.object_name))

                        e.add(opts, "'%s' is a manually-defined m2m relation through model %s, which does not have foreign keys to %s and %s" % (f.name, f.rel.through, f.rel.to._meta.object_name, cls._meta.object_name))

                else:

                    e.add(opts, "'%s' specifies an m2m relation through model %s, which has not been installed" % (f.name, f.rel.through))

django/db/models/fields/related.py

+1 −1
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ class ManyToManyField(RelatedField, Field): 
                        self._m2m_column_name_cache = f.column

                        break

            # If this is an m2m relation to self, avoid the inevitable name clash

            elif related.model == related.parent_model:

            elif related.model._meta.object_name.lower() == related.parent_model._meta.object_name.lower():

                self._m2m_column_name_cache = 'from_' + related.model._meta.object_name.lower() + '_id'

            else:

                self._m2m_column_name_cache = related.model._meta.object_name.lower() + '_id'

tests/modeltests/invalid_models/models.py

+2 −2
Original line number Diff line number Diff line
@@ -267,8 +267,8 @@ invalid_models.selfclashm2m: Reverse query name for m2m field 'm2m_3' clashes wi 
invalid_models.selfclashm2m: Reverse query name for m2m field 'm2m_4' clashes with field 'SelfClashM2M.selfclashm2m'. Add a related_name argument to the definition for 'm2m_4'.

invalid_models.missingrelations: 'rel1' has a relation with model Rel1, which has either not been installed or is abstract.

invalid_models.missingrelations: 'rel2' has an m2m relation with model Rel2, which has either not been installed or is abstract.

invalid_models.grouptwo: 'primary' has a manually-defined m2m relation through model Membership, which does not have foreign keys to Person and GroupTwo

invalid_models.grouptwo: 'secondary' has a manually-defined m2m relation through model MembershipMissingFK, which does not have foreign keys to Group and GroupTwo

invalid_models.grouptwo: 'primary' is a manually-defined m2m relation through model Membership, which does not have foreign keys to Person and GroupTwo

invalid_models.grouptwo: 'secondary' is a manually-defined m2m relation through model MembershipMissingFK, which does not have foreign keys to Group and GroupTwo

invalid_models.missingmanualm2mmodel: 'missing_m2m' specifies an m2m relation through model MissingM2MModel, which has not been installed

invalid_models.group: The model Group has two manually-defined m2m relations through the model Membership, which is not permitted. Please consider using an extra field on your intermediary model instead.

invalid_models.group: Intermediary model RelationshipDoubleFK has more than one foreign key to Person, which is ambiguous and is not permitted.

tests/regressiontests/m2m_regress/models.py

+9 −0
Original line number Diff line number Diff line 
from django.db import models

from django.contrib.auth import models as auth



# No related name is needed here, since symmetrical relations are not

# explicitly reversible.
@@ -41,6 +42,14 @@ class Worksheet(models.Model): 
    id = models.CharField(primary_key=True, max_length=100)

    lines = models.ManyToManyField(Line, blank=True, null=True)



# Regression for #11226 -- A model with the same name that another one to

# which it has a m2m relation. This shouldn't cause a name clash between

# the automatically created m2m intermediary table FK field names when

# running syncdb

class User(models.Model):

    name = models.CharField(max_length=30)

    friends = models.ManyToManyField(auth.User)



__test__ = {"regressions": """

# Multiple m2m references to the same model or a different model must be

# distinguished when accessing the relations through an instance attribute.