mirror of
https://github.com/django/django.git
synced 2024-11-30 23:20:50 +01:00
Fixed #7407 -- in Oracle, made sure table names are properly quoted when resetting sequences. Thanks, erny.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
0650bab492
commit
3b6487130a
@ -146,11 +146,11 @@ class DatabaseOperations(BaseDatabaseOperations):
|
||||
# Since we've just deleted all the rows, running our sequence
|
||||
# ALTER code will reset the sequence to 0.
|
||||
for sequence_info in sequences:
|
||||
table_name = sequence_info['table']
|
||||
seq_name = get_sequence_name(table_name)
|
||||
sequence_name = get_sequence_name(sequence_info['table'])
|
||||
table_name = self.quote_name(sequence_info['table'])
|
||||
column_name = self.quote_name(sequence_info['column'] or 'id')
|
||||
query = _get_sequence_reset_sql() % {'sequence': seq_name,
|
||||
'table': self.quote_name(table_name),
|
||||
query = _get_sequence_reset_sql() % {'sequence': sequence_name,
|
||||
'table': table_name,
|
||||
'column': column_name}
|
||||
sql.append(query)
|
||||
return sql
|
||||
@ -174,9 +174,10 @@ class DatabaseOperations(BaseDatabaseOperations):
|
||||
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())
|
||||
column_name = self.quote_name('id')
|
||||
output.append(query % {'sequence': sequence_name,
|
||||
'table': table_name,
|
||||
'column': self.quote_name('id')})
|
||||
'column': column_name})
|
||||
return output
|
||||
|
||||
def start_transaction_sql(self):
|
||||
|
Loading…
Reference in New Issue
Block a user