Ticket #7407: oracle_sequence_reset_quote_name.patch

django/db/backends/oracle/base.py

@@ -145 +145 @@
             # 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
@@ -164 +164 @@
             for f in model._meta.fields:
                 if isinstance(f, models.AutoField):
                     sequence_name = get_sequence_name(model._meta.db_table)
+                    table_name = self.quote_name(model._meta.db_table)
                     column_name = self.quote_name(f.db_column or f.name)
                     output.append(query % {'sequence': sequence_name,
-                                           'table': model._meta.db_table,
+                                           'table': table_name,
                                            'column': column_name})
                     break # Only one AutoField is allowed per model, so don't bother continuing.
             for f in model._meta.many_to_many:
                 sequence_name = get_sequence_name(f.m2m_db_table())
+                table_name = self.quote_name(f.m2m_db_table())
+                column_name = self.quote_name('id')
                 output.append(query % {'sequence': sequence_name,
-                                       'table': f.m2m_db_table(),
-                                       'column': self.quote_name('id')})
+                                       'table': table_name,
+                                       'column': column_name})
         return output
 
     def start_transaction_sql(self):