Ticket #1328: management_rename.diff

management.py

@@ -583 +583 @@
         except NotImplementedError:
             relations = {}
         for i, row in enumerate(db.get_table_description(cursor, table_name)):
-            column_name = row[0]
+            field_name = column_name = row[0]
+            if field_name in ('and', 'assert', 'break', 'class', 'continue', 'def', 'elif', 'else', 'except', 'exec', 'finally', 'for', 'from', 'global', 'if', 'import', 'in', 'is', 'lambda', 'not', 'or', 'pass', 'print', 'raise', 'return', 'try', 'while', 'yield'):
+                field_name = '%s_field'%(field_name)
+                
             if relations.has_key(i):
                 rel = relations[i]
                 rel_to = rel[1] == table_name and "'self'" or table2model(rel[1])
                 if column_name.endswith('_id'):
                     field_desc = '%s = meta.ForeignKey(%s' % (column_name[:-3], rel_to)
                 else:
-                    field_desc = '%s = meta.ForeignKey(%s, db_column=%r' % (column_name, rel_to, column_name)
+                    field_desc = '%s = meta.ForeignKey(%s, db_column=%r' % (field_name, rel_to, column_name)
             else:
                 try:
                     field_type = db.DATA_TYPES_REVERSE[row[1]]
@@ -607 +610 @@
                 else:
                     extra_params = {}
 
+                if field_name != column_name:
+                    extra_params['db_column'] = '%r'%column_name
+                    
                 if field_type == 'CharField' and row[3]:
                     extra_params['maxlength'] = row[3]
 
-                field_desc = '%s = meta.%s(' % (column_name, field_type)
+                field_desc = '%s = meta.%s(' % (field_name, field_type)
                 field_desc += ', '.join(['%s=%s' % (k, v) for k, v in extra_params.items()])
                 field_desc += ')'
+
+                if field_name != column_name:
+                    field_desc += ' # Db field was Python reserved word - field renamed'
+
                 if field_type_was_guessed:
                     field_desc += ' # This is a guess!'
             yield '    %s' % field_desc