Permalink
Browse files

Fixed a pair of bugs in determining the set of models to flush that w…

…ere causing test cause failures in Oracle after [9536].

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9546 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 9a4f176 commit 485316017a34623bb883f57bc72417e84722912b @ikelly ikelly committed Dec 2, 2008
Showing with 4 additions and 2 deletions.
  1. +1 −1 django/db/backends/__init__.py
  2. +3 −1 django/db/models/fields/related.py
@@ -404,7 +404,7 @@ def django_table_names(self, only_existing=False):
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):
@@ -1,4 +1,5 @@
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 @@ def _get_m2m_db_table(self, opts):
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"

0 comments on commit 4853160

Please sign in to comment.