p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #7565. Fixed Oracle sequence resetting on child models. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ian Kelly 2008-07-03 18:42:47 +00:00
parent 1bfe994409
commit ee837ad46a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/backends/oracle/base.py
View File

@ -162,18 +162,20 @@ class DatabaseOperations(BaseDatabaseOperations):
output = [] output = []
query = _get_sequence_reset_sql() query = _get_sequence_reset_sql()
for model in model_list: for model in model_list:
for f in model._meta.fields: for f in model._meta.local_fields:
if isinstance(f, models.AutoField): if isinstance(f, models.AutoField):
table_name = self.quote_name(model._meta.db_table)
sequence_name = get_sequence_name(model._meta.db_table) sequence_name = get_sequence_name(model._meta.db_table)
column_name = self.quote_name(f.db_column or f.name) column_name = self.quote_name(f.column)
output.append(query % {'sequence': sequence_name, output.append(query % {'sequence': sequence_name,
'table': model._meta.db_table, 'table': table_name,
'column': column_name}) 'column': column_name})
break # Only one AutoField is allowed per model, so don't bother continuing. break # Only one AutoField is allowed per model, so don't bother continuing.
for f in model._meta.many_to_many: for f in model._meta.many_to_many:
table_name = self.quote_name(f.m2m_db_table())
sequence_name = get_sequence_name(f.m2m_db_table()) sequence_name = get_sequence_name(f.m2m_db_table())
output.append(query % {'sequence': sequence_name, output.append(query % {'sequence': sequence_name,
'table': f.m2m_db_table(), 'table': table_name,
'column': self.quote_name('id')}) 'column': self.quote_name('id')})
return output return output