innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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:
Ian Kelly 2008-07-03 19:21:54 +00:00
parent 0650bab492
commit 3b6487130a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,11 +146,11 @@ class DatabaseOperations(BaseDatabaseOperations):
# Since we've just deleted all the rows, running our sequence # Since we've just deleted all the rows, running our sequence
# ALTER code will reset the sequence to 0. # ALTER code will reset the sequence to 0.
for sequence_info in sequences: for sequence_info in sequences:
table_name = sequence_info['table'] sequence_name = get_sequence_name(sequence_info['table'])
seq_name = get_sequence_name(table_name) table_name = self.quote_name(sequence_info['table'])
column_name = self.quote_name(sequence_info['column'] or 'id') column_name = self.quote_name(sequence_info['column'] or 'id')
query = _get_sequence_reset_sql() % {'sequence': seq_name, query = _get_sequence_reset_sql() % {'sequence': sequence_name,
'table': self.quote_name(table_name), 'table': table_name,
'column': column_name} 'column': column_name}
sql.append(query) sql.append(query)
return sql return sql
@ -174,9 +174,10 @@ class DatabaseOperations(BaseDatabaseOperations):
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()) 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())
column_name = self.quote_name('id')
output.append(query % {'sequence': sequence_name, output.append(query % {'sequence': sequence_name,
'table': table_name, 'table': table_name,
'column': self.quote_name('id')}) 'column': column_name})
return output return output
def start_transaction_sql(self): def start_transaction_sql(self):