From cdd9416cb3e52ba7e975292a0ef664a171f683f5 Mon Sep 17 00:00:00 2001 From: Griatch Date: Wed, 3 Apr 2013 12:10:58 +0200 Subject: [PATCH] Cleanups of migrations. --- src/objects/migrations/0016_adding_sessid.py | 113 ------------------ .../migrations/0014_adding_objs_m2m.py | 7 ++ 2 files changed, 7 insertions(+), 113 deletions(-) delete mode 100644 src/objects/migrations/0016_adding_sessid.py diff --git a/src/objects/migrations/0016_adding_sessid.py b/src/objects/migrations/0016_adding_sessid.py deleted file mode 100644 index a0ec0ae0dc..0000000000 --- a/src/objects/migrations/0016_adding_sessid.py +++ /dev/null @@ -1,113 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'ObjectDB.db_sessid' - db.add_column('objects_objectdb', 'db_sessid', - self.gf('django.db.models.fields.IntegerField')(null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'ObjectDB.db_sessid' - db.delete_column('objects_objectdb', 'db_sessid') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - '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'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'objects.alias': { - 'Meta': {'object_name': 'Alias'}, - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.objattribute': { - 'Meta': {'object_name': 'ObjAttribute'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_destination': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'destinations_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_location': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locations_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.objectnick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'ObjectNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_cmdset_storage': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_is_connected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'obj_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_objs': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'objs_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/players/migrations/0014_adding_objs_m2m.py b/src/players/migrations/0014_adding_objs_m2m.py index ff16b830f2..22cf7309f6 100644 --- a/src/players/migrations/0014_adding_objs_m2m.py +++ b/src/players/migrations/0014_adding_objs_m2m.py @@ -9,6 +9,11 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding M2M table for field db_objs on 'PlayerDB' + # Adding field 'ObjectDB.db_sessid' + db.add_column('objects_objectdb', 'db_sessid', + self.gf('django.db.models.fields.IntegerField')(null=True), + keep_default=False) + db.create_table('players_playerdb_db_objs', ( ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), ('playerdb', models.ForeignKey(orm['players.playerdb'], null=False)), @@ -26,6 +31,8 @@ class Migration(SchemaMigration): player.set_attribute("_playable_characters", [player.db_obj]) def backwards(self, orm): + # Deleting field 'ObjectDB.db_sessid' + db.delete_column('objects_objectdb', 'db_sessid') # Removing M2M table for field db_objs on 'PlayerDB' db.delete_table('players_playerdb_db_objs')