Merge lp:~zyga/lava-dashboard/fix-migration-0012 into lp:lava-dashboard

[Zygmunt Krynicki]

This fixes broken migration code.

[Spring Zhang (qzhang)]

nice fix

review: Approve

[Zygmunt Krynicki (zyga)]

I'm somewhat unsure if I had a clean state (my fix may be partially broken itself)

8 - db.add_column('dashboard_app_bundle', '_gz_content', self.gf('dashboard_app.models.GzFileField')(max_length=100, null=True, db_column='gz_content'), keep_default=False)
9 + db.add_column('dashboard_app_bundle', 'gz_content', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, db_column='gz_content'), keep_default=False)

Perhaps changing _gz_content to gz_content was incorrect:

For refrence:
http://south.aeracode.org/wiki/db.add_column
http://south.aeracode.org/wiki/db.delete_column

[lp:~zyga/lava-dashboard/fix-migration-0012]

294. By Zygmunt Krynicki on 2012-01-19

Use field name when calling db.add_column(table, field_name)

See http://south.aeracode.org/wiki/db.add_column for reference. Unlike
db.delete_column() where we need to pass the actual column name, in
add_column() we need to pass the field name (which is '_gz_content' in this
case)

[Zygmunt Krynicki (zyga)]

Could someone create a venv, put lava-server and this branch of lava-dashboard in, install lava-server, develop this dashboard and run 'lava-server manage -d syncdb' 'lava-server manage -d migrate' and tell me if they got a working system?

Thanks

[Paul Larson (pwlars)]

Please merge

review: Approve

=== modified file 'dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py'
--- dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py	2011-12-19 23:03:42 +0000
+++ dashboard_app/migrations/0012_auto__del_field_bundle_content__add_field_bundle__raw_content__add_fie.py	2012-01-19 14:45:28 +0000
@@ -9,7 +9,7 @@
     def forwards(self, orm):
         
         # Adding field 'Bundle._gz_content'
-        db.add_column('dashboard_app_bundle', '_gz_content', self.gf('dashboard_app.models.GzFileField')(max_length=100, null=True, db_column='gz_content'), keep_default=False)
+        db.add_column('dashboard_app_bundle', '_gz_content', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True, db_column='gz_content'), keep_default=False)
 
 
     def backwards(self, orm):
@@ -67,7 +67,7 @@
         },
         'dashboard_app.bundle': {
             'Meta': {'ordering': "['-uploaded_on']", 'object_name': 'Bundle'},
-            '_gz_content': ('dashboard_app.models.GzFileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}),
+            '_gz_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'gz_content'"}),
             '_raw_content': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'db_column': "'content'"}),
             'bundle_stream': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'bundles'", 'to': "orm['dashboard_app.BundleStream']"}),
             'content_filename': ('django.db.models.fields.CharField', [], {'max_length': '256'}),