diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2009-04-13 07:07:51 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2009-04-13 07:07:51 +0000 |
| commit | fd3ee7d7867dd13a336b90873ccb8df6302f2c05 (patch) | |
| tree | 16aae299cabe6a7c7e7f5d2f773f605f1965206e /django | |
| parent | 0fec0a5d704d487755209115719ca173913a43b7 (diff) | |
Fixed #9804 -- Corrected the introspection of sequence names. This was causing problems when flushing tables that had many-to-many relations through an inherited table. Thanks to jdimov for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10552 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 5 | ||||
| -rw-r--r-- | django/db/backends/__init__.py | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index adc245bb75..9fd2550185 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -193,9 +193,9 @@ class ReverseGenericRelatedObjectsDescriptor(object): rel_model = self.field.rel.to superclass = rel_model._default_manager.__class__ RelatedManager = create_generic_related_manager(superclass) - + qn = connection.ops.quote_name - + manager = RelatedManager( model = rel_model, instance = instance, @@ -285,6 +285,7 @@ class GenericRel(ManyToManyRel): self.limit_choices_to = limit_choices_to or {} self.symmetrical = symmetrical self.multiple = True + self.through = None class BaseGenericInlineFormSet(BaseModelFormSet): """ diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py index 98360d081d..579bf80aaf 100644 --- a/django/db/backends/__init__.py +++ b/django/db/backends/__init__.py @@ -530,7 +530,10 @@ class BaseDatabaseIntrospection(object): break # Only one AutoField is allowed per model, so don't bother continuing. for f in model._meta.local_many_to_many: - sequence_list.append({'table': f.m2m_db_table(), 'column': None}) + # If this is an m2m using an intermediate table, + # we don't need to reset the sequence. + if f.rel.through is None: + sequence_list.append({'table': f.m2m_db_table(), 'column': None}) return sequence_list |