From c7baab0945ec478712dcdfcf3e01bddcecf623b9 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 18 May 2013 11:02:01 +0200 Subject: [PATCH] It seems I forgot those migrations :p see #393 --- .../extensions/limits/migrations/0001_initial.py | 12 +++++------- modoboa/lib/migrations/0001_initial.py | 8 +++++--- modoboa/lib/migrations/0002_move_secret_key.py | 6 ++++-- modoboa/lib/migrations/0003_clean_parameters.py | 6 ++++-- ...auto__add_log__chg_field_userparameter_user.py | 15 +++++++-------- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/modoboa/extensions/limits/migrations/0001_initial.py b/modoboa/extensions/limits/migrations/0001_initial.py index cc191e6e6..3c4f34fe9 100644 --- a/modoboa/extensions/limits/migrations/0001_initial.py +++ b/modoboa/extensions/limits/migrations/0001_initial.py @@ -3,6 +3,8 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models +from modoboa.lib.compat import user_model_name + class Migration(SchemaMigration): @@ -11,7 +13,7 @@ class Migration(SchemaMigration): # Adding model 'LimitsPool' db.create_table('limits_limitspool', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)), + ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[user_model_name], unique=True)), )) db.send_create_signal('limits', ['LimitsPool']) @@ -42,10 +44,6 @@ class Migration(SchemaMigration): models = { - 'admin.user': { - 'Meta': {'object_name': 'User', '_ormbases': ['auth.User']}, - 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) - }, 'auth.group': { 'Meta': {'object_name': 'Group'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -59,7 +57,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - 'auth.user': { + user_model_name: { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -93,7 +91,7 @@ class Migration(SchemaMigration): 'limits.limitspool': { 'Meta': {'object_name': 'LimitsPool'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['admin.User']", 'unique': 'True'}) + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['%s']" % user_model_name, 'unique': 'True'}) } } diff --git a/modoboa/lib/migrations/0001_initial.py b/modoboa/lib/migrations/0001_initial.py index f35a2fdf9..95bb6d493 100644 --- a/modoboa/lib/migrations/0001_initial.py +++ b/modoboa/lib/migrations/0001_initial.py @@ -3,6 +3,8 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models +from modoboa.lib.compat import user_model_name + class Migration(SchemaMigration): @@ -21,7 +23,7 @@ class Migration(SchemaMigration): ('value', self.gf('django.db.models.fields.CharField')(max_length=255)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])), )) db.send_create_signal('lib', ['UserParameter']) @@ -49,7 +51,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - 'auth.user': { + user_model_name: { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -82,7 +84,7 @@ class Migration(SchemaMigration): 'Meta': {'object_name': 'UserParameter'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}), 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) } } diff --git a/modoboa/lib/migrations/0002_move_secret_key.py b/modoboa/lib/migrations/0002_move_secret_key.py index 77ee5bdd0..b3e9e5d30 100644 --- a/modoboa/lib/migrations/0002_move_secret_key.py +++ b/modoboa/lib/migrations/0002_move_secret_key.py @@ -3,6 +3,8 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models +from modoboa.lib.compat import user_model_name + class Migration(DataMigration): @@ -36,7 +38,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - 'auth.user': { + user_model_name: { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -69,7 +71,7 @@ class Migration(DataMigration): 'Meta': {'object_name': 'UserParameter'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}), 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) } } diff --git a/modoboa/lib/migrations/0003_clean_parameters.py b/modoboa/lib/migrations/0003_clean_parameters.py index 9bbe0cc59..277791d0e 100644 --- a/modoboa/lib/migrations/0003_clean_parameters.py +++ b/modoboa/lib/migrations/0003_clean_parameters.py @@ -4,6 +4,8 @@ from south.db import db from south.v2 import DataMigration from django.db import models from django.core.exceptions import ObjectDoesNotExist +from modoboa.lib.compat import user_model_name + class Migration(DataMigration): @@ -48,7 +50,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - 'auth.user': { + user_model_name: { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -81,7 +83,7 @@ class Migration(DataMigration): 'Meta': {'object_name': 'UserParameter'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}), 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) } } diff --git a/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py b/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py index e26506c11..89c681f5b 100644 --- a/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py +++ b/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py @@ -3,6 +3,8 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models +from modoboa.lib.dbutils import db_table_exists +from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -19,16 +21,13 @@ class Migration(SchemaMigration): db.send_create_signal(u'lib', ['Log']) + if db_table_exists('admin_user'): + return # Changing field 'UserParameter.user' - db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) + db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])) def backwards(self, orm): - # Deleting model 'Log' - db.delete_table(u'lib_log') - - - # Changing field 'UserParameter.user' - db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])) + raise RuntimeError("Cannot revert this migration") models = { u'admin.user': { @@ -90,4 +89,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['lib'] \ No newline at end of file + complete_apps = ['lib']