Django

Code

Changeset 9546

Show
Ignore:
Timestamp:
12/02/08 10:58:06 (1 month ago)
Author:
ikelly
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/backends/__init__.py

    r9004 r9546  
    405405                tables.update([f.m2m_db_table() for f in model._meta.local_many_to_many]) 
    406406        if only_existing: 
    407             tables = [t for t in tables if t in self.table_names()] 
     407            tables = [t for t in tables if self.table_name_converter(t) in self.table_names()] 
    408408        return tables 
    409409 

  • django/trunk/django/db/models/fields/related.py

    r8884 r9546  
    11from django.db import connection, transaction 
     2from django.db.backends import util 
    23from django.db.models import signals, get_model 
    34from django.db.models.fields import AutoField, Field, IntegerField, PositiveIntegerField, PositiveSmallIntegerField, FieldDoesNotExist 
    …… 
    772773            return self.db_table 
    773774        else: 
    774             return '%s_%s' % (opts.db_table, self.name) 
     775            return util.truncate_name('%s_%s' % (opts.db_table, self.name), 
     776                                      connection.ops.max_name_length()) 
    775777 
    776778    def _get_m2m_column_name(self, related):