diff --git a/src/objects/migrations/0011_typeclass_and_cmdset_to_new_api_default.py b/src/objects/migrations/0011_typeclass_and_cmdset_to_new_api_default.py index ead81ffac9..9586ef8437 100644 --- a/src/objects/migrations/0011_typeclass_and_cmdset_to_new_api_default.py +++ b/src/objects/migrations/0011_typeclass_and_cmdset_to_new_api_default.py @@ -12,24 +12,24 @@ class Migration(DataMigration): for obj in orm.ObjectDB.objects.all(): if obj.db_cmdset_storage == "game.gamesrc.commands.basecmdset.DefaultCmdSet": obj.db_cmdset_storage = "src.commands.default.cmdset_default.DefaultCmdSet" - obj.save() + obj.save() if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Character": obj.db_typeclass_path = "src.objects.objects.Character" obj.save() if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Object": obj.db_typeclass_path = "src.objects.objects.Object" - obj.save() + obj.save() if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Room": obj.db_typeclass_path = "src.objects.objects.Room" - obj.save() + obj.save() if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Exit": obj.db_typeclass_path = "src.objects.objects.Exit" - obj.save() - + obj.save() + except utils.DatabaseError: "We are starting from scratch. Ignore." pass - + def backwards(self, orm): diff --git a/src/objects/migrations/0012_index_objattr_values.py b/src/objects/migrations/0012_index_objattr_values.py index d39e0fbd08..af622d9e74 100644 --- a/src/objects/migrations/0012_index_objattr_values.py +++ b/src/objects/migrations/0012_index_objattr_values.py @@ -9,12 +9,12 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding index on 'ObjAttribute', fields ['db_value'] - db.create_index('objects_objattribute', ['db_value']) - + # removing this migration completely. + pass def backwards(self, orm): # Removing index on 'ObjAttribute', fields ['db_value'] - db.delete_index('objects_objattribute', ['db_value']) + raise RuntimeError models = { @@ -106,4 +106,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['objects'] \ No newline at end of file + complete_apps = ['objects'] diff --git a/src/objects/migrations/0013_revert_objattr_index.py b/src/objects/migrations/0013_revert_objattr_index.py new file mode 100644 index 0000000000..2df3a2032c --- /dev/null +++ b/src/objects/migrations/0013_revert_objattr_index.py @@ -0,0 +1,108 @@ +# -*- 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): + # Removing index on 'ObjAttribute', fields ['db_value'] + if orm.ObjAttribute._meta.get_field_by_name("db_value")[0].db_index: + db.delete_index('objects_objattribute', ['db_value']) + + def backwards(self, orm): + # Adding index on 'ObjAttribute', fields ['db_value'] + raise RuntimeError + + 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_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', [], {'to': "orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), + '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'] diff --git a/src/typeclasses/models.py b/src/typeclasses/models.py index 580bae4f90..9dd7e2d874 100644 --- a/src/typeclasses/models.py +++ b/src/typeclasses/models.py @@ -268,7 +268,7 @@ class Attribute(SharedMemoryModel): db_key = models.CharField('key', max_length=255, db_index=True) # access through the value property - db_value = models.TextField('value', blank=True, null=True, db_index=True) + db_value = models.TextField('value', blank=True, null=True) # Lock storage db_lock_storage = models.CharField('locks', max_length=512, blank=True) # references the object the attribute is linked to (this is set