Changeset 5777

Timestamp:

07/30/07 12:10:05 (1 year ago)

Author:

danderson

Message:

schema-evolution: fixed None iteration error

Files:

• django/branches/schema-evolution/django/core/management.py (modified) (4 diffs)

django/branches/schema-evolution/django/core/management.py

@@ -564 +564 @@
-    for f in opts.fields:
-        existing_fields = introspection.get_columns(cursor,db_table)
-
+and f.aka 
-            rel_field = f
-            data_type = f.get_internal_type()
@@ -610 +610 @@
-    for f in opts.fields:
-        existing_fields = introspection.get_columns(cursor,db_table)
-
+f.aka and 
-            old_col = None
-            if isinstance( f.aka, str ):
@@ -649 +649 @@
-        elif f.aka in existing_fields:
-            cf = f.aka
-
+f.aka and 
-            cf = f.aka[0]
-        else:
@@ -693 +693 @@
-        db_table = new_table_name
-    suspect_fields = set(introspection.get_columns(cursor,db_table))
+#    print 'suspect_fields = ', suspect_fields
-    for f in opts.fields:
+#        print 'f = ', f
+#        print 'f.aka = ', f.aka
-        suspect_fields.discard(f.column)
-        suspect_fields.discard(f.aka)
-
+if f.aka: 
-    if len(suspect_fields)>0:
-        output.append( '-- warning: as the following may cause data loss, it/they must be run manually' )
-
-
+    
+    
-        output.append( '-- end warning' )
-    return output