Commit 48531601 authored by Ian Kelly's avatar Ian Kelly
Browse files

Fixed a pair of bugs in determining the set of models to flush that were... 

Fixed a pair of bugs in determining the set of models to flush that were causing test cause failures in Oracle after [9536].

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

django/db/backends/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ class BaseDatabaseIntrospection(object): 
                tables.add(model._meta.db_table)

                tables.update([f.m2m_db_table() for f in model._meta.local_many_to_many])

        if only_existing:

            tables = [t for t in tables if t in self.table_names()]

            tables = [t for t in tables if self.table_name_converter(t) in self.table_names()]

        return tables



    def installed_models(self, tables):

django/db/models/fields/related.py

+3 −1
Original line number Diff line number Diff line 
from django.db import connection, transaction

from django.db.backends import util

from django.db.models import signals, get_model

from django.db.models.fields import AutoField, Field, IntegerField, PositiveIntegerField, PositiveSmallIntegerField, FieldDoesNotExist

from django.db.models.related import RelatedObject
@@ -771,7 +772,8 @@ class ManyToManyField(RelatedField, Field): 
        elif self.db_table:

            return self.db_table

        else:

            return '%s_%s' % (opts.db_table, self.name)

            return util.truncate_name('%s_%s' % (opts.db_table, self.name),

                                      connection.ops.max_name_length())



    def _get_m2m_column_name(self, related):

        "Function that can be curried to provide the source column name for the m2m table"