[Changeset] r12226 - in django/trunk: django/db/models/fields tests/modeltests/model_package

[nor...@djangoproject.com]

Author: russellm
Date: 2010-01-14 08:55:36 -0600 (Thu, 14 Jan 2010)
New Revision: 12226

Modified:
django/trunk/django/db/models/fields/related.py
django/trunk/tests/modeltests/model_package/tests.py
Log:
Fixed #12386 -- Corrected the column names produced for autogenerated m2m tables when the related table is specified as a dot-separated string. Thanks to ldevesine for the report and simonb for the extra test case.

Modified: django/trunk/django/db/models/fields/related.py
===================================================================
--- django/trunk/django/db/models/fields/related.py 2010-01-14 11:12:24 UTC (rev 12225)
+++ django/trunk/django/db/models/fields/related.py 2010-01-14 14:55:36 UTC (rev 12226)
@@ -881,8 +881,8 @@
from django.db import models
managed = True
if isinstance(field.rel.to, basestring) and field.rel.to != RECURSIVE_RELATIONSHIP_CONSTANT:
- to = field.rel.to
to_model = field.rel.to
+ to = to_model.split('.')[-1]
def set_managed(field, model, cls):
field.rel.through._meta.managed = model._meta.managed or cls._meta.managed
add_lazy_relation(klass, field, to_model, set_managed)

Modified: django/trunk/tests/modeltests/model_package/tests.py
===================================================================
--- django/trunk/tests/modeltests/model_package/tests.py 2010-01-14 11:12:24 UTC (rev 12225)
+++ django/trunk/tests/modeltests/model_package/tests.py 2010-01-14 14:55:36 UTC (rev 12226)
@@ -50,6 +50,31 @@
>>> ad.publications.count()
1

+# Regression for #12386 - field names on the autogenerated intermediate class
+# that are specified as dotted strings don't retain any path component for the
+# field or column name
+
+>>> Article.publications.through._meta.fields[1].name
+'article'
+
+>>> Article.publications.through._meta.fields[1].get_attname_column()
+('article_id', 'article_id')
+
+>>> Article.publications.through._meta.fields[2].name
+'publication'
+
+>>> Article.publications.through._meta.fields[2].get_attname_column()
+('publication_id', 'publication_id')
+
+>>> Article._meta.get_field('publications').m2m_db_table()
+'model_package_article_publications'
+
+>>> Article._meta.get_field('publications').m2m_column_name()
+'article_id'
+
+>>> Article._meta.get_field('publications').m2m_reverse_name()
+'publication_id'
+
"""}