diff --git a/src/comms/migrations/0001_initial.py b/src/comms/migrations/0001_initial.py deleted file mode 100644 index 701cf03192..0000000000 --- a/src/comms/migrations/0001_initial.py +++ /dev/null @@ -1,154 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - #depends_on = ( - # ("players", "0001_initial"), - # ("comms", "0001_initial"), - #) - - def forwards(self, orm): - - # Adding model 'Msg' - db.create_table('comms_msg', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_sender', self.gf('django.db.models.fields.related.ForeignKey')(related_name='sender_set', to=orm['players.PlayerDB'])), - ('db_receivers', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), - ('db_channels', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), - ('db_message', self.gf('django.db.models.fields.TextField')()), - ('db_date_sent', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_hide_from_sender', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('db_hide_from_receivers', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), - ('db_hide_from_channels', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(null=True)), - )) - db.send_create_signal('comms', ['Msg']) - - # Adding model 'Channel' - db.create_table('comms_channel', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)), - ('db_desc', self.gf('django.db.models.fields.CharField')(max_length=80, null=True, blank=True)), - ('db_aliases', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_keep_log', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - )) - db.send_create_signal('comms', ['Channel']) - - # Adding model 'ChannelConnection' - db.create_table('comms_channelconnection', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_player', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - ('db_channel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.Channel'])), - )) - db.send_create_signal('comms', ['ChannelConnection']) - - - def backwards(self, orm): - - # Deleting model 'Msg' - db.delete_table('comms_msg') - - # Deleting model 'Channel' - db.delete_table('comms_channel') - - # Deleting model 'ChannelConnection' - db.delete_table('comms_channelconnection') - - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.channelconnection': { - 'Meta': {'object_name': 'ChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sender_set'", 'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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 = ['comms'] diff --git a/src/comms/migrations/0002_auto__del_channelconnection__add_externalchannelconnection__add_player.py b/src/comms/migrations/0002_auto__del_channelconnection__add_externalchannelconnection__add_player.py deleted file mode 100644 index 2d9cd6230a..0000000000 --- a/src/comms/migrations/0002_auto__del_channelconnection__add_externalchannelconnection__add_player.py +++ /dev/null @@ -1,176 +0,0 @@ -# encoding: 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 model 'ExternalChannelConnection' - db.create_table('comms_externalchannelconnection', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_channel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.Channel'])), - ('db_external_key', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('db_external_path', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('db_external_config', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_is_enabled', self.gf('django.db.models.fields.BooleanField')(default=True)), - )) - db.send_create_signal('comms', ['ExternalChannelConnection']) - - db.rename_table('comms_channelconnection', 'comms_playerchannelconnection') - - # # Adding model 'PlayerChannelConnection' - # db.create_table('comms_playerchannelconnection', ( - # ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - # ('db_player', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - # ('db_channel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.Channel'])), - # )) - # db.send_create_signal('comms', ['PlayerChannelConnection']) - - # # move channelconnections to playerchannelconnections - # for conn in orm.ChannelConnection.objects.all(): - # ncon = orm.PlayerChannelConnection(db_player=conn.db_player, db_channel=conn.db_channel) - # ncon.save() - - # db - # # Deleting model 'ChannelConnection' - # db.delete_table('comms_channelconnection') - - # Adding field 'Msg.db_sender_external' - db.add_column('comms_msg', 'db_sender_external', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), keep_default=False) - - # Changing field 'Msg.db_sender' - db.alter_column('comms_msg', 'db_sender_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['players.PlayerDB'])) - - - def backwards(self, orm): - - # # Adding model 'ChannelConnection' - # db.create_table('comms_channelconnection', ( - # ('db_channel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.Channel'])), - # ('db_player', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - # ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - # )) - # db.send_create_signal('comms', ['ChannelConnection']) - - # - db.rename_table('comms_playerchannelconnection', 'comms_channelconnection') - - # Deleting model 'ExternalChannelConnection' - db.delete_table('comms_externalchannelconnection') - - # # Deleting model 'PlayerChannelConnection' - # db.delete_table('comms_playerchannelconnection') - - # Deleting field 'Msg.db_sender_external' - db.delete_column('comms_msg', 'db_sender_external') - - # User chose to not deal with backwards NULL issues for 'Msg.db_sender' - raise RuntimeError("Cannot reverse this migration. 'Msg.db_sender' and its values cannot be restored.") - - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_path': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sender_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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 = ['comms'] diff --git a/src/comms/migrations/0003_auto__del_field_externalchannelconnection_db_external_path__add_field_.py b/src/comms/migrations/0003_auto__del_field_externalchannelconnection_db_external_path__add_field_.py deleted file mode 100644 index d227dfbf19..0000000000 --- a/src/comms/migrations/0003_auto__del_field_externalchannelconnection_db_external_path__add_field_.py +++ /dev/null @@ -1,129 +0,0 @@ -# encoding: 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): - - # Deleting field 'ExternalChannelConnection.db_external_path' - db.delete_column('comms_externalchannelconnection', 'db_external_path') - - # Adding field 'ExternalChannelConnection.db_external_send_code' - db.add_column('comms_externalchannelconnection', 'db_external_send_code', self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False) - - - def backwards(self, orm): - - # User chose to not deal with backwards NULL issues for 'ExternalChannelConnection.db_external_path' - raise RuntimeError("Cannot reverse this migration. 'ExternalChannelConnection.db_external_path' and its values cannot be restored.") - - # Deleting field 'ExternalChannelConnection.db_external_send_code' - db.delete_column('comms_externalchannelconnection', 'db_external_send_code') - - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sender_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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 = ['comms'] diff --git a/src/comms/migrations/0004_changing_lock_comm_admin2control.py b/src/comms/migrations/0004_changing_lock_comm_admin2control.py deleted file mode 100644 index bbe2f6d915..0000000000 --- a/src/comms/migrations/0004_changing_lock_comm_admin2control.py +++ /dev/null @@ -1,129 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - # fixes a changed syntax in the locks. - - def forwards(self, orm): - "Write your forwards methods here." - for channel in orm.Channel.objects.all(): - lockstring = channel.db_lock_storage - lockstring = lockstring.replace("admin:", "control:") - channel.db_lock_storage = lockstring - channel.save() - - def backwards(self, orm): - "Write your backwards methods here." - for channel in orm.Channel.objects.all(): - lockstring = channel.db_lock_storage - lockstring = lockstring.replace("control:", "admin:") - channel.db_lock_storage = lockstring - channel.save() - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sender_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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 = ['comms'] diff --git a/src/comms/migrations/0005_auto__chg_field_channel_db_lock_storage__chg_field_msg_db_lock_storage.py b/src/comms/migrations/0005_auto__chg_field_channel_db_lock_storage__chg_field_msg_db_lock_storage.py deleted file mode 100644 index a0c7a3d5fb..0000000000 --- a/src/comms/migrations/0005_auto__chg_field_channel_db_lock_storage__chg_field_msg_db_lock_storage.py +++ /dev/null @@ -1,130 +0,0 @@ -# encoding: 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): - - # Changing field 'Channel.db_lock_storage' - db.alter_column('comms_channel', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'Msg.db_lock_storage' - db.alter_column('comms_msg', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(default='', max_length=512)) - - - def backwards(self, orm): - - # Changing field 'Channel.db_lock_storage' - db.alter_column('comms_channel', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'Msg.db_lock_storage' - db.alter_column('comms_msg', 'db_lock_storage', self.gf('django.db.models.fields.TextField')(null=True)) - - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sender_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - '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_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_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'}) - }, - '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_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - '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'}), - '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 = ['comms'] diff --git a/src/comms/migrations/0006_auto.py b/src/comms/migrations/0006_auto.py deleted file mode 100644 index dfd072679b..0000000000 --- a/src/comms/migrations/0006_auto.py +++ /dev/null @@ -1,124 +0,0 @@ -# encoding: 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 index on 'Channel', fields ['db_key'] - db.create_index('comms_channel', ['db_key']) - - - def backwards(self, orm): - - # Removing index on 'Channel', fields ['db_key'] - db.delete_index('comms_channel', ['db_key']) - - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_sender': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'db_sender': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sender_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.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'}) - }, - '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_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 = ['comms'] diff --git a/src/comms/migrations/0007_upgrading_msgs.py b/src/comms/migrations/0007_upgrading_msgs.py deleted file mode 100644 index 69d1d6eec8..0000000000 --- a/src/comms/migrations/0007_upgrading_msgs.py +++ /dev/null @@ -1,283 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models -from south import orm - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'Msg.db_hide_from_channels' - db.delete_column('comms_msg', 'db_hide_from_channels') - - # Deleting field 'Msg.db_hide_from_receivers' - db.delete_column('comms_msg', 'db_hide_from_receivers') - - # Deleting field 'Msg.db_receivers' - db.delete_column('comms_msg', 'db_receivers') - - # Deleting field 'Msg.db_channels' - db.delete_column('comms_msg', 'db_channels') - - # Deleting field 'Msg.db_hide_from_sender' - db.delete_column('comms_msg', 'db_hide_from_sender') - - # Deleting field 'Msg.db_sender' - db.delete_column('comms_msg', 'db_sender_id') - - # Adding field 'Msg.db_title' - db.add_column('comms_msg', 'db_title', - self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True), - keep_default=False) - - # Adding M2M table for field db_sender_players on 'Msg' - db.create_table('comms_msg_db_sender_players', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('playerdb', models.ForeignKey(orm['players.playerdb'], null=False)) - )) - db.create_unique('comms_msg_db_sender_players', ['msg_id', 'playerdb_id']) - - # Adding M2M table for field db_sender_objects on 'Msg' - db.create_table('comms_msg_db_sender_objects', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('objectdb', models.ForeignKey(orm['objects.objectdb'], null=False)) - )) - db.create_unique('comms_msg_db_sender_objects', ['msg_id', 'objectdb_id']) - - # Adding M2M table for field db_receivers_players on 'Msg' - db.create_table('comms_msg_db_receivers_players', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('playerdb', models.ForeignKey(orm['players.playerdb'], null=False)) - )) - db.create_unique('comms_msg_db_receivers_players', ['msg_id', 'playerdb_id']) - - # Adding M2M table for field db_receivers_objects on 'Msg' - db.create_table('comms_msg_db_receivers_objects', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('objectdb', models.ForeignKey(orm['objects.objectdb'], null=False)) - )) - db.create_unique('comms_msg_db_receivers_objects', ['msg_id', 'objectdb_id']) - - # Adding M2M table for field db_receivers_channels on 'Msg' - db.create_table('comms_msg_db_receivers_channels', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('channel', models.ForeignKey(orm['comms.channel'], null=False)) - )) - db.create_unique('comms_msg_db_receivers_channels', ['msg_id', 'channel_id']) - - # Adding M2M table for field db_hide_from_players on 'Msg' - db.create_table('comms_msg_db_hide_from_players', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('playerdb', models.ForeignKey(orm['players.playerdb'], null=False)) - )) - db.create_unique('comms_msg_db_hide_from_players', ['msg_id', 'playerdb_id']) - - # Adding M2M table for field db_hide_from_objects on 'Msg' - db.create_table('comms_msg_db_hide_from_objects', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('objectdb', models.ForeignKey(orm['objects.objectdb'], null=False)) - )) - db.create_unique('comms_msg_db_hide_from_objects', ['msg_id', 'objectdb_id']) - - # Adding M2M table for field db_hide_from_channles on 'Msg' - db.create_table('comms_msg_db_hide_from_channles', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('msg', models.ForeignKey(orm['comms.msg'], null=False)), - ('channel', models.ForeignKey(orm['comms.channel'], null=False)) - )) - db.create_unique('comms_msg_db_hide_from_channles', ['msg_id', 'channel_id']) - - # Adding index on 'Msg', fields ['db_date_sent'] - db.create_index('comms_msg', ['db_date_sent']) - - # Adding index on 'Msg', fields ['db_sender_external'] - db.create_index('comms_msg', ['db_sender_external']) - - # moving data to new fields - - if not db.dry_run: - if orm["comms.Msg"].objects.count(): - print "deleting old Msgs before migrating ..." - for msg in orm["comms.Msg"].objects.all(): - msg.delete() - - def backwards(self, orm): - # Removing index on 'Msg', fields ['db_sender_external'] - db.delete_index('comms_msg', ['db_sender_external']) - - # Removing index on 'Msg', fields ['db_date_sent'] - db.delete_index('comms_msg', ['db_date_sent']) - - # Adding field 'Msg.db_hide_from_channels' - db.add_column('comms_msg', 'db_hide_from_channels', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), - keep_default=False) - - # Adding field 'Msg.db_hide_from_receivers' - db.add_column('comms_msg', 'db_hide_from_receivers', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), - keep_default=False) - - # Adding field 'Msg.db_receivers' - db.add_column('comms_msg', 'db_receivers', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), - keep_default=False) - - # Adding field 'Msg.db_channels' - db.add_column('comms_msg', 'db_channels', - self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True), - keep_default=False) - - # Adding field 'Msg.db_hide_from_sender' - db.add_column('comms_msg', 'db_hide_from_sender', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - # Adding field 'Msg.db_sender' - db.add_column('comms_msg', 'db_sender', - self.gf('django.db.models.fields.related.ForeignKey')(related_name='sender_set', null=True, to=orm['players.PlayerDB']), - keep_default=False) - - # Deleting field 'Msg.db_title' - db.delete_column('comms_msg', 'db_title') - - # Removing M2M table for field db_sender_players on 'Msg' - db.delete_table('comms_msg_db_sender_players') - - # Removing M2M table for field db_sender_objects on 'Msg' - db.delete_table('comms_msg_db_sender_objects') - - # Removing M2M table for field db_receivers_players on 'Msg' - db.delete_table('comms_msg_db_receivers_players') - - # Removing M2M table for field db_receivers_objects on 'Msg' - db.delete_table('comms_msg_db_receivers_objects') - - # Removing M2M table for field db_receivers_channels on 'Msg' - db.delete_table('comms_msg_db_receivers_channels') - - # Removing M2M table for field db_hide_from_players on 'Msg' - db.delete_table('comms_msg_db_hide_from_players') - - # Removing M2M table for field db_hide_from_objects on 'Msg' - db.delete_table('comms_msg_db_hide_from_objects') - - # Removing M2M table for field db_hide_from_channles on 'Msg' - db.delete_table('comms_msg_db_hide_from_channles') - - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_hide_from_channles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.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'}) - }, - '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_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 = ['comms'] diff --git a/src/comms/migrations/0008_renamed_title_to_header.py b/src/comms/migrations/0008_renamed_title_to_header.py deleted file mode 100644 index 2ef21c3ed5..0000000000 --- a/src/comms/migrations/0008_renamed_title_to_header.py +++ /dev/null @@ -1,125 +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): - # Renaming field 'Msg.db_title' to 'Msg.db_header' - db.rename_column('comms_msg', 'db_title', 'db_header') - - def backwards(self, orm): - # Adding field 'Msg.db_title' - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), - 'db_hide_from_channles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.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'}) - }, - '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 = ['comms'] diff --git a/src/comms/migrations/0009_auto__chg_field_channel_db_lock_storage__chg_field_msg_db_lock_storage.py b/src/comms/migrations/0009_auto__chg_field_channel_db_lock_storage__chg_field_msg_db_lock_storage.py deleted file mode 100644 index 5221cd6a94..0000000000 --- a/src/comms/migrations/0009_auto__chg_field_channel_db_lock_storage__chg_field_msg_db_lock_storage.py +++ /dev/null @@ -1,133 +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): - - # Changing field 'Channel.db_lock_storage' - db.alter_column('comms_channel', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'Msg.db_lock_storage' - db.alter_column('comms_msg', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'Channel.db_lock_storage' - db.alter_column('comms_channel', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'Msg.db_lock_storage' - db.alter_column('comms_msg', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.CharField', [], {'max_length': 128, 'null': 'True', 'blank': 'True'}), - 'db_hide_from_channles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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 = ['comms'] diff --git a/src/comms/migrations/0010_auto__chg_field_msg_db_header.py b/src/comms/migrations/0010_auto__chg_field_msg_db_header.py deleted file mode 100644 index 0d0ee2e16e..0000000000 --- a/src/comms/migrations/0010_auto__chg_field_msg_db_header.py +++ /dev/null @@ -1,128 +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): - - # Changing field 'Msg.db_header' - db.alter_column('comms_msg', 'db_header', self.gf('django.db.models.fields.TextField')(null=True)) - - - def backwards(self, orm): - - # Changing field 'Msg.db_header' - db.alter_column('comms_msg', 'db_header', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)) - - 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'}) - }, - 'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': "orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': "orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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 = ['comms'] diff --git a/src/comms/migrations/0011_renaming_channles_to_channels.py b/src/comms/migrations/0011_renaming_channles_to_channels.py deleted file mode 100644 index b859446955..0000000000 --- a/src/comms/migrations/0011_renaming_channles_to_channels.py +++ /dev/null @@ -1,135 +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): - # Renaming M2M table for field db_hide_from_channles on 'Msg' - db.rename_table('comms_msg_db_hide_from_channles', 'comms_msg_db_hide_from_channels') - - def backwards(self, orm): - raise RuntimeException("Cannot revert this migration.") - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'unique': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] diff --git a/src/comms/migrations/0012_auto__add_interimchannel.py b/src/comms/migrations/0012_auto__add_interimchannel.py deleted file mode 100644 index a811b8538c..0000000000 --- a/src/comms/migrations/0012_auto__add_interimchannel.py +++ /dev/null @@ -1,182 +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 model 'InterimChannel' - db.create_table(u'comms_interimchannel', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_typeclass_path', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - )) - db.send_create_signal(u'comms', ['InterimChannel']) - - # Adding M2M table for field db_attributes on 'InterimChannel' - m2m_table_name = db.shorten_name(u'comms_interimchannel_db_attributes') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('interimchannel', models.ForeignKey(orm[u'comms.interimchannel'], null=False)), - ('attribute', models.ForeignKey(orm[u'typeclasses.attribute'], null=False)) - )) - db.create_unique(m2m_table_name, ['interimchannel_id', 'attribute_id']) - - # Adding M2M table for field db_tags on 'InterimChannel' - m2m_table_name = db.shorten_name(u'comms_interimchannel_db_tags') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('interimchannel', models.ForeignKey(orm[u'comms.interimchannel'], null=False)), - ('tag', models.ForeignKey(orm[u'typeclasses.tag'], null=False)) - )) - db.create_unique(m2m_table_name, ['interimchannel_id', 'tag_id']) - - - def backwards(self, orm): - # Deleting model 'InterimChannel' - db.delete_table(u'comms_interimchannel') - - # Removing M2M table for field db_attributes on 'InterimChannel' - db.delete_table(db.shorten_name(u'comms_interimchannel_db_attributes')) - - # Removing M2M table for field db_tags on 'InterimChannel' - db.delete_table(db.shorten_name(u'comms_interimchannel_db_tags')) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.interimchannel': { - 'Meta': {'ordering': "['-db_date_created', 'id', 'db_typeclass_path', 'db_key']", 'object_name': 'InterimChannel'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] \ No newline at end of file diff --git a/src/comms/migrations/0013_rename_channel.py b/src/comms/migrations/0013_rename_channel.py deleted file mode 100644 index 220bf991d4..0000000000 --- a/src/comms/migrations/0013_rename_channel.py +++ /dev/null @@ -1,141 +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): - db.rename_table('comms_channel', 'comms_channeldb') - db.rename_column('comms_msg_db_hide_from_channels', 'channel_id', 'channeldb_id') - db.rename_column('comms_msg_db_receivers_channels', 'channel_id', 'channeldb_id') - - def backwards(self, orm): - db.rename_table('comms_channeldb', 'comms_channel') - db.rename_column('comms_msg_db_hide_from_channels', 'channeldb_id', 'channel_id') - db.rename_column('comms_msg_db_receivers_channels', 'channeldb_id', 'channel_id') - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channel': { - 'Meta': {'object_name': 'Channel'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.Channel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.Channel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.Channel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.Channel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] \ No newline at end of file diff --git a/src/comms/migrations/0014_transfer_channels.py b/src/comms/migrations/0014_transfer_channels.py deleted file mode 100644 index 73a1d09194..0000000000 --- a/src/comms/migrations/0014_transfer_channels.py +++ /dev/null @@ -1,178 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - ChannelDB = orm['comms.ChannelDB'] - InterimChannel = orm['comms.InterimChannel'] - Attribute = orm['typeclasses.Attribute'] - Tag = orm['typeclasses.Tag'] - for channel in ChannelDB.objects.all(): - new_channel = InterimChannel(id=channel.id, db_key=channel.db_key, - db_lock_storage=channel.db_lock_storage) - new_channel.save() - desc = Attribute(db_key='desc', db_value=channel.db_desc) - desc.save() - keep_log = Attribute(db_key='keep_log', - db_value=channel.db_keep_log) - keep_log.save() - new_channel.db_attributes.add(desc) - new_channel.db_attributes.add(keep_log) - for name in [alias.strip() for alias in - channel.db_aliases.split(',')]: - tag = Tag.objects.filter(db_key=name.lower().strip(), db_category='comm_alias') - if tag: - tag = tag[0] - else: - tag = Tag(db_key=name.lower().strip(), db_category='comm_alias') - tag.save() - new_channel.db_tags.add(tag) - new_channel.save() - orm['contenttypes.ContentType'].objects.filter( - app_label='comms', model='channel').update(model='channeldb', name='ChannelDB') - - def backwards(self, orm): - "Remove all InterimChannels." - orm['comms.InterimChannel'].objects.all().delete() - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_aliases': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), - 'db_keep_log': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.interimchannel': { - 'Meta': {'ordering': "['-db_date_created', 'id', 'db_typeclass_path', 'db_key']", 'object_name': 'InterimChannel'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] - symmetrical = True diff --git a/src/comms/migrations/0015_update_foreign_keys_remove_old_channels.py b/src/comms/migrations/0015_update_foreign_keys_remove_old_channels.py deleted file mode 100644 index c1d822a0f6..0000000000 --- a/src/comms/migrations/0015_update_foreign_keys_remove_old_channels.py +++ /dev/null @@ -1,183 +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): - # Changing field 'ExternalChannelConnection.db_channel' - db.alter_column(u'comms_externalchannelconnection', 'db_channel_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.InterimChannel'])) - - # Changing field 'PlayerChannelConnection.db_channel' - db.alter_column(u'comms_playerchannelconnection', 'db_channel_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.InterimChannel'])) - - # Deleting model 'ChannelDB' - db.delete_table(u'comms_channeldb') - - def backwards(self, orm): - # Adding model 'ChannelDB' - db.create_table(u'comms_channeldb', ( - ('db_desc', self.gf('django.db.models.fields.CharField')(max_length=80, null=True, blank=True)), - ('db_aliases', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, unique=True, db_index=True)), - ('db_keep_log', self.gf('django.db.models.fields.BooleanField')(default=True)), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal(u'comms', ['ChannelDB']) - - InterimChannel = orm['comms.InterimTable'] - Attribute = orm['typeclasses.Attribute'] - ChannelDB = orm['comms.ChannelDB'] - - for channel in InterimChannel.objects.all(): - try: - desc = channel.db_attributes.objects.get(db_key='desc').db_value - except Attribute.DoesNotExist: - desc = '' - try: - keep_log = channel.db_attributes.objects.get( - db_key='keep_log').db_value - except Attribute.DoesNotExist: - keep_log = False - aliases = [alias.db_key for alias in - channel.db_tags.filter('comm_alias')] - aliases = ','.join(aliases) - new_channel = ChannelDB(db_desc=desc, db_keep_log=False, id=channel.id, - db_key=channel.db_key, db_lock_storage=channel.db_lock_storage, - db_aliases=aliases) - new_channel.save() - - - # Changing field 'ExternalChannelConnection.db_channel' - db.alter_column(u'comms_externalchannelconnection', 'db_channel_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.ChannelDB'])) - - # Changing field 'PlayerChannelConnection.db_channel' - db.alter_column(u'comms_playerchannelconnection', 'db_channel_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.ChannelDB'])) - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.InterimChannel']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.interimchannel': { - 'Meta': {'object_name': 'InterimChannel'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.InterimChannel']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.InterimChannel']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.InterimChannel']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] \ No newline at end of file diff --git a/src/comms/migrations/0016_finalize_tables.py b/src/comms/migrations/0016_finalize_tables.py deleted file mode 100644 index 692ef26b29..0000000000 --- a/src/comms/migrations/0016_finalize_tables.py +++ /dev/null @@ -1,162 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - db.rename_table('comms_interimchannel', 'comms_channeldb') - db.rename_table('comms_interimchannel_db_attributes', 'comms_channeldb_db_attributes') - db.rename_table('comms_interimchannel_db_tags', 'comms_channeldb_db_tags') - db.rename_column('comms_channeldb_db_attributes', 'interimchannel_id', 'channeldb_id') - db.rename_column('comms_channeldb_db_tags', 'interimchannel_id', 'channeldb_id') - - - def backwards(self, orm): - "Write your backwards methods here." - db.rename_column('comms_channeldb_db_attributes', 'channeldb_id', 'interimchannel_id') - db.rename_column('comms_channeldb_db_tags', 'channeldb_id', 'interimchannel_id') - db.rename_table('comms_channeldb', 'comms_interimchannel') - db.rename_table('comms_channeldb_db_attributes', 'comms_interimchannel_db_attributes') - db.rename_table('comms_channeldb_db_tags', 'comms_interimchannel_db_tags') - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.interimchannel': { - 'Meta': {'object_name': 'InterimChannel'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] - symmetrical = True diff --git a/src/comms/migrations/0017_renaming_typeclass_from_comm_to_channel.py b/src/comms/migrations/0017_renaming_typeclass_from_comm_to_channel.py deleted file mode 100644 index e72221a849..0000000000 --- a/src/comms/migrations/0017_renaming_typeclass_from_comm_to_channel.py +++ /dev/null @@ -1,146 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - for ch in orm.ChannelDB.objects.all(): - if ch.db_typeclass_path == u"src.comms.comms.Comm": - ch.db_typeclass_path = "src.comms.comms.Channel" - ch.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("Cannot revert this migration.") - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] - symmetrical = True diff --git a/src/comms/migrations/0018_add_subscribers_m2mfield.py b/src/comms/migrations/0018_add_subscribers_m2mfield.py deleted file mode 100644 index da58e843fd..0000000000 --- a/src/comms/migrations/0018_add_subscribers_m2mfield.py +++ /dev/null @@ -1,153 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding M2M table for field db_subscriptions on 'ChannelDB' - m2m_table_name = db.shorten_name(u'comms_channeldb_db_subscriptions') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('channeldb', models.ForeignKey(orm[u'comms.channeldb'], null=False)), - ('playerdb', models.ForeignKey(orm[u'players.playerdb'], null=False)) - )) - db.create_unique(m2m_table_name, ['channeldb_id', 'playerdb_id']) - - - def backwards(self, orm): - # Removing M2M table for field db_subscriptions on 'ChannelDB' - db.delete_table(db.shorten_name(u'comms_channeldb_db_subscriptions')) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_subscriptions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'subscriber_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] diff --git a/src/comms/migrations/0019_converting_playerconnection_to_m2m.py b/src/comms/migrations/0019_converting_playerconnection_to_m2m.py deleted file mode 100644 index 21d02b9db3..0000000000 --- a/src/comms/migrations/0019_converting_playerconnection_to_m2m.py +++ /dev/null @@ -1,151 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - - for connection in orm['comms.PlayerChannelConnection'].objects.all(): - channel, player = connection.db_channel, connection.db_player - channel.db_subscriptions.add(player) - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("Cannot revert this migration.") - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_subscriptions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'subscriber_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] - symmetrical = True diff --git a/src/comms/migrations/0020_auto__del_playerchannelconnection.py b/src/comms/migrations/0020_auto__del_playerchannelconnection.py deleted file mode 100644 index 0d13a64b2b..0000000000 --- a/src/comms/migrations/0020_auto__del_playerchannelconnection.py +++ /dev/null @@ -1,146 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting model 'PlayerChannelConnection' - db.delete_table(u'comms_playerchannelconnection') - - - def backwards(self, orm): - # Adding model 'PlayerChannelConnection' - db.create_table(u'comms_playerchannelconnection', ( - ('db_channel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.ChannelDB'])), - ('db_player', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal(u'comms', ['PlayerChannelConnection']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_subscriptions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'subscription_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] \ No newline at end of file diff --git a/src/comms/migrations/0021_auto__del_externalchannelconnection.py b/src/comms/migrations/0021_auto__del_externalchannelconnection.py deleted file mode 100644 index 40d6e0ccac..0000000000 --- a/src/comms/migrations/0021_auto__del_externalchannelconnection.py +++ /dev/null @@ -1,141 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting model 'ExternalChannelConnection' - db.delete_table(u'comms_externalchannelconnection') - - - def backwards(self, orm): - # Adding model 'ExternalChannelConnection' - db.create_table(u'comms_externalchannelconnection', ( - ('db_external_config', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_external_key', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('db_channel', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['comms.ChannelDB'])), - ('db_is_enabled', self.gf('django.db.models.fields.BooleanField')(default=True)), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_external_send_code', self.gf('django.db.models.fields.TextField')(blank=True)), - )) - db.send_create_signal(u'comms', ['ExternalChannelConnection']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_subscriptions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'subscription_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_bot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['comms'] \ No newline at end of file diff --git a/src/comms/migrations/__init__.py b/src/comms/migrations/__init__.py index e69de29bb2..40a96afc6f 100644 --- a/src/comms/migrations/__init__.py +++ b/src/comms/migrations/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/src/help/migrations/0001_initial.py b/src/help/migrations/0001_initial.py deleted file mode 100644 index f948fdd9fd..0000000000 --- a/src/help/migrations/0001_initial.py +++ /dev/null @@ -1,43 +0,0 @@ -# encoding: 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 model 'HelpEntry' - db.create_table('help_helpentry', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=255)), - ('db_help_category', self.gf('django.db.models.fields.CharField')(default='General', max_length=255)), - ('db_entrytext', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_permissions', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_staff_only', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal('help', ['HelpEntry']) - - - def backwards(self, orm): - - # Deleting model 'HelpEntry' - db.delete_table('help_helpentry') - - - models = { - 'help.helpentry': { - 'Meta': {'object_name': 'HelpEntry'}, - 'db_entrytext': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_help_category': ('django.db.models.fields.CharField', [], {'default': "'General'", 'max_length': '255'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_staff_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['help'] diff --git a/src/help/migrations/0002_auto__chg_field_helpentry_db_lock_storage.py b/src/help/migrations/0002_auto__chg_field_helpentry_db_lock_storage.py deleted file mode 100644 index d1e2afb258..0000000000 --- a/src/help/migrations/0002_auto__chg_field_helpentry_db_lock_storage.py +++ /dev/null @@ -1,34 +0,0 @@ -# encoding: 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): - - # Changing field 'HelpEntry.db_lock_storage' - db.alter_column('help_helpentry', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - - def backwards(self, orm): - - # Changing field 'HelpEntry.db_lock_storage' - db.alter_column('help_helpentry', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - - models = { - 'help.helpentry': { - 'Meta': {'object_name': 'HelpEntry'}, - 'db_entrytext': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_help_category': ('django.db.models.fields.CharField', [], {'default': "'General'", 'max_length': '255'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - '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_staff_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['help'] diff --git a/src/help/migrations/0003_auto__chg_field_helpentry_db_lock_storage.py b/src/help/migrations/0003_auto__chg_field_helpentry_db_lock_storage.py deleted file mode 100644 index 2d116f7d95..0000000000 --- a/src/help/migrations/0003_auto__chg_field_helpentry_db_lock_storage.py +++ /dev/null @@ -1,33 +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): - - # Changing field 'HelpEntry.db_lock_storage' - db.alter_column('help_helpentry', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'HelpEntry.db_lock_storage' - db.alter_column('help_helpentry', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - models = { - 'help.helpentry': { - 'Meta': {'object_name': 'HelpEntry'}, - 'db_entrytext': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_help_category': ('django.db.models.fields.CharField', [], {'default': "'General'", 'max_length': '255'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_staff_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['help'] \ No newline at end of file diff --git a/src/help/migrations/0004_auto__del_field_helpentry_db_permissions.py b/src/help/migrations/0004_auto__del_field_helpentry_db_permissions.py deleted file mode 100644 index 602f9cb9c7..0000000000 --- a/src/help/migrations/0004_auto__del_field_helpentry_db_permissions.py +++ /dev/null @@ -1,54 +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): - # Deleting field 'HelpEntry.db_permissions' - db.delete_column(u'help_helpentry', 'db_permissions') - - # Adding M2M table for field db_tags on 'HelpEntry' - m2m_table_name = db.shorten_name(u'help_helpentry_db_tags') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('helpentry', models.ForeignKey(orm[u'help.helpentry'], null=False)), - ('tag', models.ForeignKey(orm[u'typeclasses.tag'], null=False)) - )) - db.create_unique(m2m_table_name, ['helpentry_id', 'tag_id']) - - - def backwards(self, orm): - # Adding field 'HelpEntry.db_permissions' - db.add_column(u'help_helpentry', 'db_permissions', - self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), - keep_default=False) - - # Removing M2M table for field db_tags on 'HelpEntry' - db.delete_table(db.shorten_name(u'help_helpentry_db_tags')) - - - models = { - u'help.helpentry': { - 'Meta': {'object_name': 'HelpEntry'}, - 'db_entrytext': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_help_category': ('django.db.models.fields.CharField', [], {'default': "'General'", 'max_length': '255'}), - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_staff_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['help'] \ No newline at end of file diff --git a/src/help/migrations/__init__.py b/src/help/migrations/__init__.py index e69de29bb2..40a96afc6f 100644 --- a/src/help/migrations/__init__.py +++ b/src/help/migrations/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/src/objects/migrations/0001_initial.py b/src/objects/migrations/0001_initial.py deleted file mode 100644 index ceae227c74..0000000000 --- a/src/objects/migrations/0001_initial.py +++ /dev/null @@ -1,177 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'ObjAttribute' - db.create_table('objects_objattribute', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('db_mode', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - )) - db.send_create_signal('objects', ['ObjAttribute']) - - # Adding model 'Alias' - db.create_table('objects_alias', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - )) - db.send_create_signal('objects', ['Alias']) - - # Adding model 'Nick' - db.create_table('objects_nick', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_nick', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_real', self.gf('django.db.models.fields.TextField')()), - ('db_type', self.gf('django.db.models.fields.CharField')(default='inputline', max_length=16, null=True, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - )) - db.send_create_signal('objects', ['Nick']) - - # Adding unique constraint on 'Nick', fields ['db_nick', 'db_type', 'db_obj'] - db.create_unique('objects_nick', ['db_nick', 'db_type', 'db_obj_id']) - - # Adding model 'ObjectDB' - db.create_table('objects_objectdb', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_typeclass_path', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_permissions', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - # Moved to player migration - #('db_player', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'], null=True, blank=True)), - ('db_location', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='locations_set', null=True, to=orm['objects.ObjectDB'])), - ('db_home', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='homes_set', null=True, to=orm['objects.ObjectDB'])), - ('db_cmdset_storage', self.gf('django.db.models.fields.TextField')(null=True)), - )) - db.send_create_signal('objects', ['ObjectDB']) - - - def backwards(self, orm): - - # Removing unique constraint on 'Nick', fields ['db_nick', 'db_type', 'db_obj'] - db.delete_unique('objects_nick', ['db_nick', 'db_type', 'db_obj_id']) - - # Deleting model 'ObjAttribute' - db.delete_table('objects_objattribute') - - # Deleting model 'Alias' - db.delete_table('objects_alias') - - # Deleting model 'Nick' - db.delete_table('objects_nick') - - # Deleting model 'ObjectDB' - db.delete_table('objects_objectdb') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.nick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'Nick'}, - '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'}) - }, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_mode': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', '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.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0002_auto__del_field_objattribute_db_mode.py b/src/objects/migrations/0002_auto__del_field_objattribute_db_mode.py deleted file mode 100644 index 521fcc9d96..0000000000 --- a/src/objects/migrations/0002_auto__del_field_objattribute_db_mode.py +++ /dev/null @@ -1,182 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -# overloading pickle to have it find the PackedDBobj in this module -import pickle - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -renametable = { - 'src.typeclasses.models': 'src.objects.migrations.0019_convert_attrdata', - 'PackedDBobject': 'PackedDBobject', -} - -def mapname(name): - if name in renametable: - return renametable[name] - return name - -def mapped_load_global(self): - module = mapname(self.readline()[:-1]) - name = mapname(self.readline()[:-1]) - klass = self.find_class(module, name) - self.append(klass) - -def loads(str): - file = StringIO(str) - unpickler = pickle.Unpickler(file) - unpickler.dispatch[pickle.GLOBAL] = mapped_load_global - return unpickler.load() - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Deleting field 'ObjAttribute.db_mode' - - if not db.dry_run: - for attr in orm["objects.ObjAttribute"].objects.all(): - # resave attributes - db_mode = attr.db_mode - if db_mode and db_mode != 'pickle': - # an object. We need to resave this. - if db_mode == 'object': - val = PackedDBobject(attr.db_value, "objectdb") - elif db_mode == 'player': - val = PackedDBobject(attr.db_value, "playerdb") - elif db_mode == 'script': - val = PackedDBobject(attr.db_value, "scriptdb") - elif db_mode == 'help': - val = PackedDBobject(attr.db_value, "helpentry") - else: - val = PackedDBobject(attr.db_value, db_mode) # channel, msg - attr.value = val - - db.delete_column('objects_objattribute', 'db_mode') - - - def backwards(self, orm): - - # Adding field 'ObjAttribute.db_mode' - db.add_column('objects_objattribute', 'db_mode', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True), keep_default=False) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.nick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'Nick'}, - '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'}) - }, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0003_auto__add_field_objectdb_db_destination.py b/src/objects/migrations/0003_auto__add_field_objectdb_db_destination.py deleted file mode 100644 index b35157b09a..0000000000 --- a/src/objects/migrations/0003_auto__add_field_objectdb_db_destination.py +++ /dev/null @@ -1,128 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models -from src.objects.models import ObjectDB -from south import orm - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding field 'ObjectDB.db_destination' - db.add_column('objects_objectdb', 'db_destination', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='destinations_set', null=True, to=orm['objects.ObjectDB']), keep_default=False) - - #move all exits to the new property - if not db.dry_run: - #for exi in ObjectDB.objects.get_objs_with_attr('_destination'): - #for exi in orm["objects.ObjAttribute"].objects.get_objs_with_attr('_destination'): - for exi in orm["objects.ObjAttribute"].objects.select_related("db_obj").filter(db_key="_destination").values_list('db_obj'): - exi.destination = exi.db._destination - exi.del_attribute('_destination') - - def backwards(self, orm): - - # Deleting field 'ObjectDB.db_destination' - db.delete_column('objects_objectdb', 'db_destination_id') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.nick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'Nick'}, - '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'}) - }, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0004_rename_nick_to_objectnick.py b/src/objects/migrations/0004_rename_nick_to_objectnick.py deleted file mode 100644 index 2c51c6f0c6..0000000000 --- a/src/objects/migrations/0004_rename_nick_to_objectnick.py +++ /dev/null @@ -1,135 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models, utils - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - try: - # if we migrate, we just rename the table. This will move over all values too. - db.rename_table("objects_nick", "objects_objectnick") - except utils.DatabaseError: - # this happens if we start from scratch. In that case the old - # database table doesn't exist, so we just create the new one. - - # Adding model 'ObjectNick' - db.create_table('objects_objectnick', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_nick', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_real', self.gf('django.db.models.fields.TextField')()), - ('db_type', self.gf('django.db.models.fields.CharField')(default='inputline', max_length=16, null=True, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - )) - db.send_create_signal('objects', ['ObjectNick']) - - # Adding unique constraint on 'ObjectNick', fields ['db_nick', 'db_type', 'db_obj'] - db.create_unique('objects_objectnick', ['db_nick', 'db_type', 'db_obj_id']) - - - def backwards(self, orm): - raise RuntimeError("This migration cannot be reversed.") - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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_lock_storage': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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.TextField', [], {'null': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0005_add_object_default_locks.py b/src/objects/migrations/0005_add_object_default_locks.py deleted file mode 100644 index 9be0da80d9..0000000000 --- a/src/objects/migrations/0005_add_object_default_locks.py +++ /dev/null @@ -1,132 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - - # we need to add a default lock string to all objects, then a separate set to Characters. - - lockstring1 = 'control:id(1);get:all();edit:perm(Wizards);examine:perm(Builders);call:true();puppet:id(#4) or perm(Immortals) or pperm(Immortals);delete:id(1) or perm(Wizards)' - lockstring2 = 'control:id(#3) or perm(Immortals);get:perm(Wizards);edit:perm(Wizards);examine:perm(Builders);call:false();puppet:id(%i) or pid(%i) or perm(Immortals) or pperm(Immortals);delete:perm(Wizards)' - - try: - for obj in orm.ObjectDB.objects.all().exclude(db_player__isnull=False): - obj.db_lock_storage = lockstring1 - obj.save() - for obj in orm.ObjectDB.objects.filter(db_player__isnull=False): - obj.db_lock_storage = lockstring2 % (obj.id, obj.db_player.id) - obj.save() - - except utils.DatabaseError: - # running from scatch. In this case we just ignore this. - pass - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("You cannot reverse this migration.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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_lock_storage': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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.TextField', [], {'null': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0006_add_view_lock.py b/src/objects/migrations/0006_add_view_lock.py deleted file mode 100644 index ed69c8a90b..0000000000 --- a/src/objects/migrations/0006_add_view_lock.py +++ /dev/null @@ -1,130 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - - lockstring1 = 'control:id(1);get:all();edit:perm(Wizards);view:all();examine:perm(Builders);call:true();puppet:id(#4) or perm(Immortals) or pperm(Immortals);delete:id(1) or perm(Wizards)' - lockstring2 = 'control:id(#3) or perm(Immortals);get:perm(Wizards);edit:perm(Wizards);view:all();examine:perm(Builders);call:false();puppet:id(%i) or pid(%i) or perm(Immortals) or pperm(Immortals);delete:perm(Wizards)' - - try: - for obj in orm.ObjectDB.objects.all().exclude(db_player__isnull=False): - obj.db_lock_storage = lockstring1 - obj.save() - for obj in orm.ObjectDB.objects.filter(db_player__isnull=False): - obj.db_lock_storage = lockstring2 % (obj.id, obj.db_player.id) - obj.save() - - except utils.DatabaseError: - # running from scatch. In this case we just ignore this. - pass - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("You cannot reverse this migration.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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_lock_storage': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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.TextField', [], {'null': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0007_auto__chg_field_objectdb_db_cmdset_storage__chg_field_objectdb_db_lock.py b/src/objects/migrations/0007_auto__chg_field_objectdb_db_cmdset_storage__chg_field_objectdb_db_lock.py deleted file mode 100644 index 685dc6a0ee..0000000000 --- a/src/objects/migrations/0007_auto__chg_field_objectdb_db_cmdset_storage__chg_field_objectdb_db_lock.py +++ /dev/null @@ -1,138 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ObjectDB.db_cmdset_storage' - db.alter_column('objects_objectdb', 'db_cmdset_storage', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'ObjectDB.db_lock_storage' - db.alter_column('objects_objectdb', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'ObjectDB.db_permissions' - db.alter_column('objects_objectdb', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'ObjAttribute.db_lock_storage' - db.alter_column('objects_objattribute', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - - def backwards(self, orm): - - # Changing field 'ObjectDB.db_cmdset_storage' - db.alter_column('objects_objectdb', 'db_cmdset_storage', self.gf('django.db.models.fields.TextField')(null=True)) - - # Changing field 'ObjectDB.db_lock_storage' - db.alter_column('objects_objectdb', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'ObjectDB.db_permissions' - db.alter_column('objects_objectdb', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'ObjAttribute.db_lock_storage' - db.alter_column('objects_objattribute', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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_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'}), - '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_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_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - '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'}), - '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0008_auto.py b/src/objects/migrations/0008_auto.py deleted file mode 100644 index 6ff2b3a649..0000000000 --- a/src/objects/migrations/0008_auto.py +++ /dev/null @@ -1,132 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding index on 'ObjectDB', fields ['db_key'] - db.create_index('objects_objectdb', ['db_key']) - - # Adding index on 'Alias', fields ['db_key'] - db.create_index('objects_alias', ['db_key']) - - # Adding index on 'ObjAttribute', fields ['db_key'] - db.create_index('objects_objattribute', ['db_key']) - - - def backwards(self, orm): - - # Removing index on 'ObjAttribute', fields ['db_key'] - db.delete_index('objects_objattribute', ['db_key']) - - # Removing index on 'Alias', fields ['db_key'] - db.delete_index('objects_alias', ['db_key']) - - # Removing index on 'ObjectDB', fields ['db_key'] - db.delete_index('objects_objectdb', ['db_key']) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0009_converting_attributes.py b/src/objects/migrations/0009_converting_attributes.py deleted file mode 100644 index 702e46349a..0000000000 --- a/src/objects/migrations/0009_converting_attributes.py +++ /dev/null @@ -1,488 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - import cPickle as pickle -except ImportError: - import pickle -from src.utils.utils import to_str, to_unicode -from django.contrib.contenttypes.models import ContentType -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -def from_attr(attr, datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.dbref_search(data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif dtype == PackedDBobject: - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return PackedDict(attr, dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()]))) - elif hasattr(item, '__iter__'): - return PackedList(attr, list(iter_id2db(val) for val in item)) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - - if not db.dry_run: - for attr in orm.ObjAttribute.objects.all(): - # repack attr into new format, and reimport - try: - val = pickle.loads(to_str(attr.db_value)) - if hasattr(val, '__iter__'): - val = ("iter", val) - elif type(val) == PackedDBobject: - val = ("dbobj", val) - else: - val = ("simple", val) - attr.db_value = to_unicode(pickle.dumps(to_str(to_attr(from_attr(attr, val))))) - attr.save() - except TypeError, RuntimeError: - pass - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0010_converting_attributes.py b/src/objects/migrations/0010_converting_attributes.py deleted file mode 100644 index af7eebc8d6..0000000000 --- a/src/objects/migrations/0010_converting_attributes.py +++ /dev/null @@ -1,389 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - import cPickle as pickle -except ImportError: - import pickle -from src.utils.utils import to_str, to_unicode -#from src.typeclasses.models import PackedDBobject - -from django.contrib.contenttypes.models import ContentType -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - """ - self.db_obj = db_obj - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.db_obj.value = self - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.db_obj.value = self - def pop(self, *args, **kwargs): - "Custom pop" - super(PackedDict, self).pop(*args, **kwargs) - self.db_obj.value = self - def popitem(self, *args, **kwargs): - "Custom popitem" - super(PackedDict, self).popitem(*args, **kwargs) - self.db_obj.value = self - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.db_obj.value = self - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing list. - db_obj - the Attribute object storing this dict. - """ - self.db_obj = db_obj - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.db_obj.value = self - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.db_obj.value = self - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.db_obj.value = self - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.db_obj.value = self - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.db_obj.value = self - def pop(self, *args, **kwargs): - "Custom pop" - super(PackedList, self).pop(*args, **kwargs) - self.db_obj.value = self - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.db_obj.value = self - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.db_obj.value = self - - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -def from_attr(attr, datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.dbref_search(data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif dtype == PackedDBobject: - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - - for attr in orm.ObjAttribute.objects.all(): - # repack attr into new format, and reimport - try: - val = pickle.loads(to_str(attr.db_value)) - attr.db_value = to_unicode(pickle.dumps(to_str(to_attr(from_attr(attr, val))))) - attr.save() - except TypeError, RuntimeError: - pass - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] 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 deleted file mode 100644 index 677520dedc..0000000000 --- a/src/objects/migrations/0011_typeclass_and_cmdset_to_new_api_default.py +++ /dev/null @@ -1,138 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - try: - 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() - 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() - if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Room": - obj.db_typeclass_path = "src.objects.objects.Room" - obj.save() - if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Exit": - obj.db_typeclass_path = "src.objects.objects.Exit" - obj.save() - - except utils.DatabaseError: - "We are starting from scratch. Ignore." - pass - - - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0012_index_objattr_values.py b/src/objects/migrations/0012_index_objattr_values.py deleted file mode 100644 index 85b5ae3d5b..0000000000 --- a/src/objects/migrations/0012_index_objattr_values.py +++ /dev/null @@ -1,120 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding index on 'ObjAttribute', fields ['db_value'] - # removing this migration completely. - pass - - def backwards(self, orm): - # Removing 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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', [], {'db_index': 'True', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0013_revert_objattr_index.py b/src/objects/migrations/0013_revert_objattr_index.py deleted file mode 100644 index 88347fc62a..0000000000 --- a/src/objects/migrations/0013_revert_objattr_index.py +++ /dev/null @@ -1,119 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0014_auto__chg_field_objectdb_db_lock_storage.py b/src/objects/migrations/0014_auto__chg_field_objectdb_db_lock_storage.py deleted file mode 100644 index 674545fc1b..0000000000 --- a/src/objects/migrations/0014_auto__chg_field_objectdb_db_lock_storage.py +++ /dev/null @@ -1,120 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ObjectDB.db_lock_storage' - db.alter_column('objects_objectdb', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'ObjectDB.db_lock_storage' - db.alter_column('objects_objectdb', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/objects/migrations/0015_auto__chg_field_objattribute_db_lock_storage.py b/src/objects/migrations/0015_auto__chg_field_objattribute_db_lock_storage.py deleted file mode 100644 index 227f7ccd9e..0000000000 --- a/src/objects/migrations/0015_auto__chg_field_objattribute_db_lock_storage.py +++ /dev/null @@ -1,120 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ObjAttribute.db_lock_storage' - db.alter_column('objects_objattribute', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'ObjAttribute.db_lock_storage' - db.alter_column('objects_objattribute', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/objects/migrations/0016_add_sessid.py b/src/objects/migrations/0016_add_sessid.py deleted file mode 100644 index 87f9591826..0000000000 --- a/src/objects/migrations/0016_add_sessid.py +++ /dev/null @@ -1,122 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/objects/migrations/0017_rename_default_cmdsets.py b/src/objects/migrations/0017_rename_default_cmdsets.py deleted file mode 100644 index 8412a4d03f..0000000000 --- a/src/objects/migrations/0017_rename_default_cmdsets.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - depends_on = (('players', '0014_add_attr__playable_characters'),) - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - if not db.dry_run: - for obj in orm['objects.ObjectDB'].objects.filter(db_cmdset_storage=u'src.commands.default.cmdset_default.DefaultCmdSet'): - obj.db_cmdset_storage=u'src.commands.default.cmdset_character.CharacterCmdSet' - obj.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("You cannot revert this migration.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] - symmetrical = True diff --git a/src/objects/migrations/0018_add_picklefield.py b/src/objects/migrations/0018_add_picklefield.py deleted file mode 100644 index d44499fdd6..0000000000 --- a/src/objects/migrations/0018_add_picklefield.py +++ /dev/null @@ -1,123 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'ObjAttribute.db_value2' - db.add_column('objects_objattribute', 'db_value2', - self.gf('src.utils.picklefield.PickledObjectField')(null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'ObjAttribute.db_value2' - db.delete_column('objects_objattribute', 'db_value2') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'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'}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': '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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/objects/migrations/0019_convert_attrdata.py b/src/objects/migrations/0019_convert_attrdata.py deleted file mode 100644 index 33cce76875..0000000000 --- a/src/objects/migrations/0019_convert_attrdata.py +++ /dev/null @@ -1,526 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models -from django.contrib.contenttypes.models import ContentType - -from src.utils.utils import to_str -from src.utils.dbserialize import to_pickle -try: - import cPickle as pickle -except ImportError: - import pickle -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - - -# overloading pickle to have it find the PackedDBobj in this module -import pickle - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -renametable = { - 'src.typeclasses.models': 'src.objects.migrations.0019_convert_attrdata', - 'PackedDBobject': 'PackedDBobject', -} - -def mapname(name): - if name in renametable: - return renametable[name] - return name - -def mapped_load_global(self): - module = mapname(self.readline()[:-1]) - name = mapname(self.readline()[:-1]) - klass = self.find_class(module, name) - self.append(klass) - -def loads(str): - file = StringIO(str) - unpickler = pickle.Unpickler(file) - unpickler.dispatch[pickle.GLOBAL] = mapped_load_global - return unpickler.load() - - - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - # modified for migration - converts to plain python properties - def from_attr(datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - #app_map = {'objectdb':".objects.objectdb", "scriptdb":"scripts.scriptdb", "playerdb":"players.playerdb"} - #print "data.db_model:", data.db_model - #mclass = orm[data.db_model].model_class() - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.get(id=data.id) - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - except TypeError, e: - print e - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float, long, bool): # check the most common types first, for speed - return item - elif dtype == PackedDBobject or hasattr(item, '__class__') and item.__class__.__name__ == "PackedDBobject": - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - - if not db.dry_run: - for attr in orm['objects.ObjAttribute'].objects.all(): - # repack attr into new format and reimport - datatuple = loads(to_str(attr.db_value)) - python_data = from_attr(datatuple) - new_data = to_pickle(python_data) - attr.db_value2 = new_data # new pickleObjectField - attr.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("This migration cannot be reversed.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'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'}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': '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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] - symmetrical = True diff --git a/src/objects/migrations/0020_remove_old_attr_value_field.py b/src/objects/migrations/0020_remove_old_attr_value_field.py deleted file mode 100644 index aca95071c9..0000000000 --- a/src/objects/migrations/0020_remove_old_attr_value_field.py +++ /dev/null @@ -1,125 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'ObjAttribute.db_value' - db.delete_column('objects_objattribute', 'db_value') - db.rename_column('objects_objattribute', 'db_value2', 'db_value') - - - def backwards(self, orm): - # Adding field 'ObjAttribute.db_value' - db.add_column('objects_objattribute', 'db_value', - self.gf('django.db.models.fields.TextField')(null=True, blank=True), - keep_default=False) - db.rename_column('objects_objattribute', 'db_value', 'db_value2') - - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': '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.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0021_auto__del_objattribute.py b/src/objects/migrations/0021_auto__del_objattribute.py deleted file mode 100644 index 2ac2ccb5c5..0000000000 --- a/src/objects/migrations/0021_auto__del_objattribute.py +++ /dev/null @@ -1,140 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting model 'ObjAttribute' - db.delete_table(u'objects_objattribute') - - # Adding M2M table for field db_attributes on 'ObjectDB' - db.create_table(u'objects_objectdb_db_attributes', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('objectdb', models.ForeignKey(orm[u'objects.objectdb'], null=False)), - ('attribute', models.ForeignKey(orm[u'typeclasses.attribute'], null=False)) - )) - db.create_unique(u'objects_objectdb_db_attributes', ['objectdb_id', 'attribute_id']) - - - def backwards(self, orm): - # Adding model 'ObjAttribute' - db.create_table(u'objects_objattribute', ( - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_value2', self.gf('src.utils.picklefield.PickledObjectField')(null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal('objects', ['ObjAttribute']) - - # Removing M2M table for field db_attributes on 'ObjectDB' - db.delete_table('objects_objectdb_db_attributes') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'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': u"orm['objects.ObjectDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/objects/migrations/0022_add_db_liteattributes_db_tags.py b/src/objects/migrations/0022_add_db_liteattributes_db_tags.py deleted file mode 100644 index 9fcefb6a4a..0000000000 --- a/src/objects/migrations/0022_add_db_liteattributes_db_tags.py +++ /dev/null @@ -1,141 +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 M2M table for field db_liteattributes on 'ObjectDB' - m2m_table_name = db.shorten_name(u'objects_objectdb_db_liteattributes') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('objectdb', models.ForeignKey(orm[u'objects.objectdb'], null=False)), - ('liteattribute', models.ForeignKey(orm[u'typeclasses.liteattribute'], null=False)) - )) - db.create_unique(m2m_table_name, ['objectdb_id', 'liteattribute_id']) - - # Adding M2M table for field db_tags on 'ObjectDB' - m2m_table_name = db.shorten_name(u'objects_objectdb_db_tags') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('objectdb', models.ForeignKey(orm[u'objects.objectdb'], null=False)), - ('tag', models.ForeignKey(orm[u'typeclasses.tag'], null=False)) - )) - db.create_unique(m2m_table_name, ['objectdb_id', 'tag_id']) - - - def backwards(self, orm): - # Removing M2M table for field db_liteattributes on 'ObjectDB' - db.delete_table(db.shorten_name(u'objects_objectdb_db_liteattributes')) - - # Removing M2M table for field db_tags on 'ObjectDB' - db.delete_table(db.shorten_name(u'objects_objectdb_db_tags')) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'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': u"orm['objects.ObjectDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_location': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locations_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0023_auto__del_objectnick__del_unique_objectnick_db_nick_db_type_db_obj__de.py b/src/objects/migrations/0023_auto__del_objectnick__del_unique_objectnick_db_nick_db_type_db_obj__de.py deleted file mode 100644 index 3f8ba80cab..0000000000 --- a/src/objects/migrations/0023_auto__del_objectnick__del_unique_objectnick_db_nick_db_type_db_obj__de.py +++ /dev/null @@ -1,134 +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): - depends_on = (('typeclasses', '0004_copy_nicks_to_liteattrs_aliases_to_tags'),) - - def forwards(self, orm): - # Removing unique constraint on 'ObjectNick', fields ['db_nick', 'db_type', 'db_obj'] - db.delete_unique(u'objects_objectnick', ['db_nick', 'db_type', 'db_obj_id']) - - # Deleting model 'ObjectNick' - db.delete_table(u'objects_objectnick') - - # Deleting model 'Alias' - db.delete_table(u'objects_alias') - - - def backwards(self, orm): - # Adding model 'ObjectNick' - db.create_table(u'objects_objectnick', ( - ('db_type', self.gf('django.db.models.fields.CharField')(default='inputline', max_length=16, null=True, blank=True)), - ('db_nick', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_real', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal(u'objects', ['ObjectNick']) - - # Adding unique constraint on 'ObjectNick', fields ['db_nick', 'db_type', 'db_obj'] - db.create_unique(u'objects_objectnick', ['db_nick', 'db_type', 'db_obj_id']) - - # Adding model 'Alias' - db.create_table(u'objects_alias', ( - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'])), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal(u'objects', ['Alias']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_location': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locations_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/0024_move_permissions_to_handler.py b/src/objects/migrations/0024_move_permissions_to_handler.py deleted file mode 100644 index e20eeb0f35..0000000000 --- a/src/objects/migrations/0024_move_permissions_to_handler.py +++ /dev/null @@ -1,112 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - Tag = orm['typeclasses.Tag'] - for obj in orm.ObjectDB.objects.all(): - if obj.db_permissions: - for perm in [perm.strip() for perm in obj.db_permissions.split(",")]: - tag = Tag.objects.filter(db_key=perm.lower().strip(), db_category="permissions") - if tag: - tag = tag[0] - else: - tag = Tag(db_key=perm.lower().strip(), db_category="permissions") - tag.save() - obj.db_tags.add(tag) - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects'] - symmetrical = True diff --git a/src/objects/migrations/0025_auto__del_field_objectdb_db_permissions.py b/src/objects/migrations/0025_auto__del_field_objectdb_db_permissions.py deleted file mode 100644 index 78d293c6d5..0000000000 --- a/src/objects/migrations/0025_auto__del_field_objectdb_db_permissions.py +++ /dev/null @@ -1,102 +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): - # Deleting field 'ObjectDB.db_permissions' - db.delete_column(u'objects_objectdb', 'db_permissions') - - - def backwards(self, orm): - # Adding field 'ObjectDB.db_permissions' - db.add_column(u'objects_objectdb', 'db_permissions', - self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), - keep_default=False) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects'] \ No newline at end of file diff --git a/src/objects/migrations/0026_auto__chg_field_objectdb_db_sessid__chg_field_objectdb_db_player__chg_.py b/src/objects/migrations/0026_auto__chg_field_objectdb_db_sessid__chg_field_objectdb_db_player__chg_.py deleted file mode 100644 index 58a640dde4..0000000000 --- a/src/objects/migrations/0026_auto__chg_field_objectdb_db_sessid__chg_field_objectdb_db_player__chg_.py +++ /dev/null @@ -1,129 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ObjectDB.db_sessid' - db.alter_column(u'objects_objectdb', 'db_sessid', self.gf('django.db.models.fields.CommaSeparatedIntegerField')(max_length=32, null=True)) - - # Changing field 'ObjectDB.db_player' - db.alter_column(u'objects_objectdb', 'db_player_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'], null=True, on_delete=models.SET_NULL)) - - # Changing field 'ObjectDB.db_destination' - db.alter_column(u'objects_objectdb', 'db_destination_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, on_delete=models.SET_NULL, to=orm['objects.ObjectDB'])) - - # Changing field 'ObjectDB.db_home' - db.alter_column(u'objects_objectdb', 'db_home_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, on_delete=models.SET_NULL, to=orm['objects.ObjectDB'])) - - # Changing field 'ObjectDB.db_location' - db.alter_column(u'objects_objectdb', 'db_location_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, on_delete=models.SET_NULL, to=orm['objects.ObjectDB'])) - - def backwards(self, orm): - - # Changing field 'ObjectDB.db_sessid' - db.alter_column(u'objects_objectdb', 'db_sessid', self.gf('django.db.models.fields.IntegerField')(null=True)) - - # Changing field 'ObjectDB.db_player' - db.alter_column(u'objects_objectdb', 'db_player_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'], null=True)) - - # Changing field 'ObjectDB.db_destination' - db.alter_column(u'objects_objectdb', 'db_destination_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['objects.ObjectDB'])) - - # Changing field 'ObjectDB.db_home' - db.alter_column(u'objects_objectdb', 'db_home_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['objects.ObjectDB'])) - - # Changing field 'ObjectDB.db_location' - db.alter_column(u'objects_objectdb', 'db_location_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['objects.ObjectDB'])) - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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', 'on_delete': 'models.SET_NULL', 'to': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"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', 'on_delete': 'models.SET_NULL', 'to': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'on_delete': 'models.SET_NULL'}), - 'db_sessid': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'max_length': '32', 'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_bot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category', 'db_tagtype'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category', 'db_tagtype'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects'] diff --git a/src/objects/migrations/__init__.py b/src/objects/migrations/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/players/migrations/0001_initial.py b/src/players/migrations/0001_initial.py deleted file mode 100644 index 82af0ca229..0000000000 --- a/src/players/migrations/0001_initial.py +++ /dev/null @@ -1,137 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - depends_on = ( - ("objects", "0001_initial"), - ) - - def forwards(self, orm): - - # Adding model 'PlayerAttribute' - db.create_table('players_playerattribute', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('db_mode', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - )) - db.send_create_signal('players', ['PlayerAttribute']) - - # Adding model 'PlayerDB' - db.create_table('players_playerdb', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_typeclass_path', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_permissions', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_orm_label], unique=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'], null=True)), - )) - db.send_create_signal('players', ['PlayerDB']) - - # Hack to get around circular table creation. - db.add_column('objects_objectdb', 'db_player', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'], null=True, blank=True)) - - - def backwards(self, orm): - - # Deleting model 'PlayerAttribute' - db.delete_table('players_playerattribute') - - # Deleting model 'PlayerDB' - db.delete_table('players_playerdb') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_mode': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0002_auto__del_field_playerattribute_db_mode.py b/src/players/migrations/0002_auto__del_field_playerattribute_db_mode.py deleted file mode 100644 index 1fecfe6d40..0000000000 --- a/src/players/migrations/0002_auto__del_field_playerattribute_db_mode.py +++ /dev/null @@ -1,519 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -# overloading pickle to have it find the PackedDBobj in this module -import pickle - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -renametable = { - 'src.typeclasses.models': 'src.players.migrations.0018_convert_attrdata', - 'PackedDBobject': 'PackedDBobject', -} - -def mapname(name): - if name in renametable: - return renametable[name] - return name - -def mapped_load_global(self): - module = mapname(self.readline()[:-1]) - name = mapname(self.readline()[:-1]) - klass = self.find_class(module, name) - self.append(klass) - -def loads(str): - file = StringIO(str) - unpickler = pickle.Unpickler(file) - unpickler.dispatch[pickle.GLOBAL] = mapped_load_global - return unpickler.load() - - - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -# modified for migration - converts to plain python properties -def from_attr(datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.get(id=data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float, long, bool): # check the most common types first, for speed - return item - elif dtype == PackedDBobject or hasattr(item, '__class__') and item.__class__.__name__ == "PackedDBobject": - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Deleting field 'PlayerAttribute.db_mode' - - if not db.dry_run: - for attr in orm["players.PlayerAttribute"].objects.all(): - # resave attributes - db_mode = attr.db_mode - if db_mode and db_mode != 'pickle': - # an object. We need to resave this. - if db_mode == 'object': - val = PackedDBobject(attr.db_value, "objectdb") - elif db_mode == 'player': - val = PackedDBobject(attr.db_value, "playerdb") - elif db_mode == 'script': - val = PackedDBobject(attr.db_value, "scriptdb") - elif db_mode == 'help': - val = PackedDBobject(attr.db_value, "helpentry") - else: - val = PackedDBobject(attr.db_value, db_mode) # channel, msg - val = to_attr(val) - attr.db_value = val - attr.save() - - db.delete_column('players_playerattribute', 'db_mode') - - - def backwards(self, orm): - - # Adding field 'PlayerAttribute.db_mode' - db.add_column('players_playerattribute', 'db_mode', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True), keep_default=False) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0003_auto__add_field_playerdb_db_cmdset_storage.py b/src/players/migrations/0003_auto__add_field_playerdb_db_cmdset_storage.py deleted file mode 100644 index bef24f62ac..0000000000 --- a/src/players/migrations/0003_auto__add_field_playerdb_db_cmdset_storage.py +++ /dev/null @@ -1,106 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding field 'PlayerDB.db_cmdset_storage' - db.add_column('players_playerdb', 'db_cmdset_storage', self.gf('django.db.models.fields.TextField')(null=True), keep_default=False) - - - def backwards(self, orm): - - # Deleting field 'PlayerDB.db_cmdset_storage' - db.delete_column('players_playerdb', 'db_cmdset_storage') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0004_auto__add_playernick__add_unique_playernick_db_nick_db_type_db_obj.py b/src/players/migrations/0004_auto__add_playernick__add_unique_playernick_db_nick_db_type_db_obj.py deleted file mode 100644 index b2754d55fc..0000000000 --- a/src/players/migrations/0004_auto__add_playernick__add_unique_playernick_db_nick_db_type_db_obj.py +++ /dev/null @@ -1,127 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'PlayerNick' - db.create_table('players_playernick', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_nick', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_real', self.gf('django.db.models.fields.TextField')()), - ('db_type', self.gf('django.db.models.fields.CharField')(default='inputline', max_length=16, null=True, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - )) - db.send_create_signal('players', ['PlayerNick']) - - # Adding unique constraint on 'PlayerNick', fields ['db_nick', 'db_type', 'db_obj'] - db.create_unique('players_playernick', ['db_nick', 'db_type', 'db_obj_id']) - - - def backwards(self, orm): - - # Removing unique constraint on 'PlayerNick', fields ['db_nick', 'db_type', 'db_obj'] - db.delete_unique('players_playernick', ['db_nick', 'db_type', 'db_obj_id']) - - # Deleting model 'PlayerNick' - db.delete_table('players_playernick') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0005_adding_player_cmdset.py b/src/players/migrations/0005_adding_player_cmdset.py deleted file mode 100644 index ba198f4e33..0000000000 --- a/src/players/migrations/0005_adding_player_cmdset.py +++ /dev/null @@ -1,119 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils -from django.conf import settings - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - try: - for player in orm.PlayerDB.objects.all(): - if not player.db_cmdset_storage: - player.db_cmdset_storage = settings.CMDSET_PLAYER - player.save() - except utils.DatabaseError: - # this will happen if we start db from scratch (ignore in that case) - pass - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("This migration cannot be reverted.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0006_auto__chg_field_playerdb_db_cmdset_storage__chg_field_playerdb_db_lock.py b/src/players/migrations/0006_auto__chg_field_playerdb_db_cmdset_storage__chg_field_playerdb_db_lock.py deleted file mode 100644 index e7f2574d3e..0000000000 --- a/src/players/migrations/0006_auto__chg_field_playerdb_db_cmdset_storage__chg_field_playerdb_db_lock.py +++ /dev/null @@ -1,132 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'PlayerDB.db_cmdset_storage' - db.alter_column('players_playerdb', 'db_cmdset_storage', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - # Changing field 'PlayerDB.db_lock_storage' - db.alter_column('players_playerdb', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'PlayerDB.db_permissions' - db.alter_column('players_playerdb', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'PlayerAttribute.db_lock_storage' - db.alter_column('players_playerattribute', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - - def backwards(self, orm): - - # Changing field 'PlayerDB.db_cmdset_storage' - db.alter_column('players_playerdb', 'db_cmdset_storage', self.gf('django.db.models.fields.TextField')(null=True)) - - # Changing field 'PlayerDB.db_lock_storage' - db.alter_column('players_playerdb', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'PlayerDB.db_permissions' - db.alter_column('players_playerdb', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'PlayerAttribute.db_lock_storage' - db.alter_column('players_playerattribute', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - '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_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_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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - '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'}), - '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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0007_auto.py b/src/players/migrations/0007_auto.py deleted file mode 100644 index 9d5f4922bc..0000000000 --- a/src/players/migrations/0007_auto.py +++ /dev/null @@ -1,120 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding index on 'PlayerDB', fields ['db_key'] - db.create_index('players_playerdb', ['db_key']) - - # Adding index on 'PlayerAttribute', fields ['db_key'] - db.create_index('players_playerattribute', ['db_key']) - - - def backwards(self, orm): - - # Removing index on 'PlayerAttribute', fields ['db_key'] - db.delete_index('players_playerattribute', ['db_key']) - - # Removing index on 'PlayerDB', fields ['db_key'] - db.delete_index('players_playerdb', ['db_key']) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0008_converting_attributes.py b/src/players/migrations/0008_converting_attributes.py deleted file mode 100644 index 5c86fb962e..0000000000 --- a/src/players/migrations/0008_converting_attributes.py +++ /dev/null @@ -1,485 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - import cPickle as pickle -except ImportError: - import pickle -from src.utils.utils import to_str, to_unicode -#from src.typeclasses.models import PackedDBobject,PackedDict,PackedList - -from django.contrib.contenttypes.models import ContentType -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -def from_attr(attr, datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.dbref_search(data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif dtype == PackedDBobject: - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return PackedDict(attr, dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()]))) - elif hasattr(item, '__iter__'): - return PackedList(attr, list(iter_id2db(val) for val in item)) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - for attr in orm['players.PlayerAttribute'].objects.all(): - try: - # repack attr into new format, and reimport - val = pickle.loads(to_str(attr.db_value)) - if hasattr(val, '__iter__'): - val = ("iter", val) - elif type(val) == PackedDBobject: - val = ("dbobj", val) - else: - val = ("simple", val) - attr.db_value = to_unicode(pickle.dumps(to_str(to_attr(from_attr(attr, val))))) - attr.save() - except TypeError, RuntimeError: - pass - - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0009_converting_attributes.py b/src/players/migrations/0009_converting_attributes.py deleted file mode 100644 index b978094950..0000000000 --- a/src/players/migrations/0009_converting_attributes.py +++ /dev/null @@ -1,368 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - import cPickle as pickle -except ImportError: - import pickle -from src.utils.utils import to_str, to_unicode -#from src.typeclasses.models import PackedDBobject - -from django.contrib.contenttypes.models import ContentType -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - """ - self.db_obj = db_obj - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.db_obj.value = self - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.db_obj.value = self - def pop(self, *args, **kwargs): - "Custom pop" - super(PackedDict, self).pop(*args, **kwargs) - self.db_obj.value = self - def popitem(self, *args, **kwargs): - "Custom popitem" - super(PackedDict, self).popitem(*args, **kwargs) - self.db_obj.value = self - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.db_obj.value = self - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing list. - db_obj - the Attribute object storing this dict. - """ - self.db_obj = db_obj - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.db_obj.value = self - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.db_obj.value = self - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.db_obj.value = self - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.db_obj.value = self - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.db_obj.value = self - def pop(self, *args, **kwargs): - "Custom pop" - super(PackedList, self).pop(*args, **kwargs) - self.db_obj.value = self - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.db_obj.value = self - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.db_obj.value = self - - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -def from_attr(attr, datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.dbref_search(data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif dtype == PackedDBobject: - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - for attr in orm['players.PlayerAttribute'].objects.all(): - try: - # repack attr into new format, and reimport - val = pickle.loads(to_str(attr.db_value)) - attr.db_value = to_unicode(pickle.dumps(to_str(to_attr(from_attr(attr, val))))) - attr.save() - except TypeError, RuntimeError: - pass - - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0010_typeclass_and_cmdset_to_new_api_default.py b/src/players/migrations/0010_typeclass_and_cmdset_to_new_api_default.py deleted file mode 100644 index 78528b7d54..0000000000 --- a/src/players/migrations/0010_typeclass_and_cmdset_to_new_api_default.py +++ /dev/null @@ -1,120 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - try: - for obj in orm.PlayerDB.objects.all(): - if obj.db_cmdset_storage == "game.gamesrc.commands.basecmdset.OOCCmdSet": - obj.db_cmdset_storage = "src.commands.default.cmdset_ooc.OOCCmdSet" - obj.save() - if obj.db_typeclass_path == "game.gamesrc.objects.baseobjects.Player": - obj.db_typeclass_path = "src.players.player.Player" - obj.save() - except utils.DatabaseError: - "We are starting from scratch. Ignore." - pass - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0011_addin_is_connected_field.py b/src/players/migrations/0011_addin_is_connected_field.py deleted file mode 100644 index 140a3e8918..0000000000 --- a/src/players/migrations/0011_addin_is_connected_field.py +++ /dev/null @@ -1,116 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'PlayerDB.db_is_connected' - db.add_column('players_playerdb', 'db_is_connected', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'PlayerDB.db_is_connected' - db.delete_column('players_playerdb', 'db_is_connected') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] \ No newline at end of file diff --git a/src/players/migrations/0012_auto__chg_field_playerdb_db_lock_storage.py b/src/players/migrations/0012_auto__chg_field_playerdb_db_lock_storage.py deleted file mode 100644 index 72043d5ca1..0000000000 --- a/src/players/migrations/0012_auto__chg_field_playerdb_db_lock_storage.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'PlayerDB.db_lock_storage' - db.alter_column('players_playerdb', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'PlayerDB.db_lock_storage' - db.alter_column('players_playerdb', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] \ No newline at end of file diff --git a/src/players/migrations/0013_auto__chg_field_playerattribute_db_lock_storage.py b/src/players/migrations/0013_auto__chg_field_playerattribute_db_lock_storage.py deleted file mode 100644 index 65564d956d..0000000000 --- a/src/players/migrations/0013_auto__chg_field_playerattribute_db_lock_storage.py +++ /dev/null @@ -1,114 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'PlayerAttribute.db_lock_storage' - db.alter_column('players_playerattribute', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'PlayerAttribute.db_lock_storage' - db.alter_column('players_playerattribute', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] \ No newline at end of file diff --git a/src/players/migrations/0014_add_attr__playable_characters.py b/src/players/migrations/0014_add_attr__playable_characters.py deleted file mode 100644 index 472f9e2d3d..0000000000 --- a/src/players/migrations/0014_add_attr__playable_characters.py +++ /dev/null @@ -1,169 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime, pickle -from south.db import db -from south.v2 import DataMigration -from django.db import models -#from src.typeclasses.models import PackedDBobject - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - lockstring = "attrread:perm(Admins);attredit:perm(Admins);attrcreate:perm(Admins)" - #lockstring2 = "attrread:false();attredit:false();attrcreate:false()" - if not db.dry_run: - for player in orm['players.PlayerDB'].objects.all(): - char = player.db_obj - if char: - val = pickle.dumps(("iter", [PackedDBobject(char.id, "objectdb", char.db_key)])) - else: - val = pickle.dumps(("iter", [])) - orm['players.PlayerAttribute'].objects.create(db_key="_playable_characters", - db_obj=player, - db_lock_storage=lockstring, - db_value=val) - if char: - val = pickle.dumps(("dbobj", PackedDBobject(char.id, "objectdb", char.db_key))) - orm['players.PlayerAttribute'].objects.create(db_key="_last_puppet", - db_obj=player, - db_value=val) - - suser = char and char.id == 1 - #if suser: - # # REMOVED - this is not needed - Griatch - # # the superuser unmask attribute for the superuser (note that this - # # is not a security risk, it only works if player's superuser bit is set too) - # val = pickle.dumps(("simple", suser)) - # orm['objects.ObjAttribute'].objects.create(db_key="_superuser_character", - # db_obj=char, - # db_lock_storage=lockstring2, - # db_value=val) - - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("This migration cannot be reverted.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] - symmetrical = True diff --git a/src/players/migrations/0015_removing_obj.py b/src/players/migrations/0015_removing_obj.py deleted file mode 100644 index 7ec2f00483..0000000000 --- a/src/players/migrations/0015_removing_obj.py +++ /dev/null @@ -1,118 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'PlayerDB.db_obj' - if not db.dry_run: - db.delete_column('players_playerdb', 'db_obj_id') - - - def backwards(self, orm): - # Adding field 'PlayerDB.db_obj' - db.add_column('players_playerdb', 'db_obj', - self.gf('django.db.models.fields.related.ForeignKey')(related_name='obj_set', null=True, to=orm['objects.ObjectDB'], blank=True), - keep_default=False) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0016_rename_default_cmdsets.py b/src/players/migrations/0016_rename_default_cmdsets.py deleted file mode 100644 index 82ee447995..0000000000 --- a/src/players/migrations/0016_rename_default_cmdsets.py +++ /dev/null @@ -1,101 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - if not db.dry_run: - for obj in orm['players.PlayerDB'].objects.filter(db_cmdset_storage=u'src.commands.default.cmdset_ooc.OOCCmdSet'): - obj.db_cmdset_storage=u'src.commands.default.cmdset_player.PlayerCmdSet' - obj.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("Cannot revert this migration") - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] - symmetrical = True diff --git a/src/players/migrations/0017_add_picklefield.py b/src/players/migrations/0017_add_picklefield.py deleted file mode 100644 index 550768d4cb..0000000000 --- a/src/players/migrations/0017_add_picklefield.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'PlayerAttribute.db_value2' - db.add_column('players_playerattribute', 'db_value2', - self.gf('src.utils.picklefield.PickledObjectField')(null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'PlayerAttribute.db_value2' - db.delete_column('players_playerattribute', 'db_value2') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] \ No newline at end of file diff --git a/src/players/migrations/0018_convert_attrdata.py b/src/players/migrations/0018_convert_attrdata.py deleted file mode 100644 index bd7e77e935..0000000000 --- a/src/players/migrations/0018_convert_attrdata.py +++ /dev/null @@ -1,456 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -from django.contrib.contenttypes.models import ContentType - -from src.utils.utils import to_str -from src.utils.dbserialize import to_pickle -try: - import cPickle as pickle -except ImportError: - import pickle -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - - -# overloading pickle to have it find the PackedDBobj in this module -import pickle - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -renametable = { - 'src.typeclasses.models': 'src.players.migrations.0018_convert_attrdata', - 'PackedDBobject': 'PackedDBobject', -} - -def mapname(name): - if name in renametable: - return renametable[name] - return name - -def mapped_load_global(self): - module = mapname(self.readline()[:-1]) - name = mapname(self.readline()[:-1]) - klass = self.find_class(module, name) - self.append(klass) - -def loads(str): - file = StringIO(str) - unpickler = pickle.Unpickler(file) - unpickler.dispatch[pickle.GLOBAL] = mapped_load_global - return unpickler.load() - - - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() - - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - depends_on = ( - ("objects", "0018_add_picklefield"), - ) - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - # modified for migration - converts to plain python properties - def from_attr(datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.get(id=data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float, long, bool): # check the most common types first, for speed - return item - elif dtype == PackedDBobject or hasattr(item, '__class__') and item.__class__.__name__ == "PackedDBobject": - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - - if not db.dry_run: - for attr in orm['players.PlayerAttribute'].objects.all(): - # repack attr into new format and reimport - datatuple = loads(to_str(attr.db_value)) - python_data = from_attr(datatuple) - new_data = to_pickle(python_data) - attr.db_value2 = new_data # new pickleObjectField - attr.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("This migration cannot be reversed.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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'}) - }, - '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.TextField', [], {'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'}) - }, - '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] - symmetrical = True diff --git a/src/players/migrations/0019_remove_old_attr_value_field.py b/src/players/migrations/0019_remove_old_attr_value_field.py deleted file mode 100644 index 5c3483f68b..0000000000 --- a/src/players/migrations/0019_remove_old_attr_value_field.py +++ /dev/null @@ -1,102 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'PlayerAttribute.db_value' - db.delete_column('players_playerattribute', 'db_value') - db.rename_column('players_playerattribute', 'db_value2', 'db_value') - - def backwards(self, orm): - # Adding field 'PlayerAttribute.db_value' - db.add_column('players_playerattribute', 'db_value', - self.gf('django.db.models.fields.TextField')(null=True, blank=True), - keep_default=False) - db.rename_column('players_playerattribute', 'db_value', 'db_value2') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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'}) - }, - 'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['players.PlayerDB']"}), - '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'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0020_auto__del_playerattribute.py b/src/players/migrations/0020_auto__del_playerattribute.py deleted file mode 100644 index 4c2975df53..0000000000 --- a/src/players/migrations/0020_auto__del_playerattribute.py +++ /dev/null @@ -1,118 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting model 'PlayerAttribute' - db.delete_table(u'players_playerattribute') - - # Adding M2M table for field db_attributes on 'PlayerDB' - db.create_table(u'players_playerdb_db_attributes', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('playerdb', models.ForeignKey(orm[u'players.playerdb'], null=False)), - ('attribute', models.ForeignKey(orm[u'typeclasses.attribute'], null=False)) - )) - db.create_unique(u'players_playerdb_db_attributes', ['playerdb_id', 'attribute_id']) - - - def backwards(self, orm): - # Adding model 'PlayerAttribute' - db.create_table(u'players_playerattribute', ( - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_value2', self.gf('src.utils.picklefield.PickledObjectField')(null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal('players', ['PlayerAttribute']) - - # Removing M2M table for field db_attributes on 'PlayerDB' - db.delete_table('players_playerdb_db_attributes') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0021_add_playerdbtmp.py b/src/players/migrations/0021_add_playerdbtmp.py deleted file mode 100644 index 08489a859b..0000000000 --- a/src/players/migrations/0021_add_playerdbtmp.py +++ /dev/null @@ -1,147 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models, connection - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding model 'PlayerDBtmp' - if "auth_user" in connection.introspection.table_names(): - # auth_user exists ffrom before. Use that as a base. - db.rename_table('auth_user', 'players_playerdbtmp') - db.rename_table('auth_user_groups', 'players_playerdbtmp_groups') - db.rename_table('auth_user_user_permissions', 'players_playerdbtmp_user_permissions') - db.rename_column('players_playerdbtmp_groups', 'user_id', 'playerdbtmp_id') - db.rename_column('players_playerdbtmp_user_permissions', 'user_id', 'playerdbtmp_id') - - else: - # from-scratch creation; no auth_user table available. Create vanilla User table - db.create_table(u'players_playerdbtmp', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)), - ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)), - ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - )) - db.send_create_signal(u'players', ['PlayerDBtmp']) - - # Adding M2M table for field groups on 'PlayerDBtmp' - db.create_table(u'players_playerdbtmp_groups', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('playerdbtmp', models.ForeignKey(orm[u'players.playerdbtmp'], null=False)), - ('group', models.ForeignKey(orm[u'auth.group'], null=False)) - )) - db.create_unique(u'players_playerdbtmp_groups', ['playerdbtmp_id', 'group_id']) - - # Adding M2M table for field user_permissions on 'PlayerDBtmp' - db.create_table(u'players_playerdbtmp_user_permissions', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('playerdbtmp', models.ForeignKey(orm[u'players.playerdbtmp'], null=False)), - ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) - )) - db.create_unique(u'players_playerdbtmp_user_permissions', ['playerdbtmp_id', 'permission_id']) - - # add Evennia-specific columns - db.add_column('players_playerdbtmp', 'db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True, null=True)) - db.add_column('players_playerdbtmp', 'db_typeclass_path', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - db.add_column('players_playerdbtmp', 'db_date_created', self.gf('django.db.models.fields.DateTimeField')(null=True, auto_now_add=True, blank=True)) - db.add_column('players_playerdbtmp', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True, null=True)) - db.add_column('players_playerdbtmp', 'db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True, null=True)) - db.add_column('players_playerdbtmp', 'db_is_connected', self.gf('django.db.models.fields.BooleanField')(default=False)) - db.add_column('players_playerdbtmp', 'db_cmdset_storage', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)) - - def backwards(self, orm): - raise RuntimeError("Cannot revert migration") - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'players.playerdbtmp': { - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0022_copy_user_profile_to_tmp.py b/src/players/migrations/0022_copy_user_profile_to_tmp.py deleted file mode 100644 index 302ccd1934..0000000000 --- a/src/players/migrations/0022_copy_user_profile_to_tmp.py +++ /dev/null @@ -1,132 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - if not db.dry_run: - for profile in orm['players.PlayerDB'].objects.all(): - print "player orig:", profile.db_key, profile.db_cmdset_storage - plyr = orm['players.PlayerDBtmp'].objects.get(id=profile.user_id) - plyr.db_cmdset_storage = profile.db_cmdset_storage - plyr.db_date_created = profile.db_date_created - plyr.db_is_connected = profile.db_is_connected - plyr.db_key = profile.db_key - plyr.db_lock_storage = profile.db_lock_storage - plyr.db_typeclass_path = profile.db_typeclass_path - plyr.db_permissions = profile.db_permissions - plyr.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("Cannot revert this migration.") - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'players.playerdbtmp': { - 'Meta': {'ordering': "['-db_date_created', 'id', 'db_typeclass_path', 'db_key']", 'object_name': 'PlayerDBtmp'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'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'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] - symmetrical = True diff --git a/src/players/migrations/0023_delete_old_profile.py b/src/players/migrations/0023_delete_old_profile.py deleted file mode 100644 index da7372c67a..0000000000 --- a/src/players/migrations/0023_delete_old_profile.py +++ /dev/null @@ -1,119 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - db.delete_table('players_playerdb') - - def backwards(self, orm): - raise RuntimeError("Cannot revert this migration") - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'players.playerdbtmp': { - 'Meta': {'ordering': "['-db_date_created', 'id', 'db_typeclass_path', 'db_key']", 'object_name': 'PlayerDBtmp'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0024_rename_tmp_to_player.py b/src/players/migrations/0024_rename_tmp_to_player.py deleted file mode 100644 index 098ac9ae3e..0000000000 --- a/src/players/migrations/0024_rename_tmp_to_player.py +++ /dev/null @@ -1,110 +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): - - db.rename_table('players_playerdbtmp', 'players_playerdb') - db.rename_table('players_playerdbtmp_groups', 'players_playerdb_groups') - db.rename_column('players_playerdb_groups', 'playerdbtmp_id', 'playerdb_id') - db.rename_table('players_playerdbtmp_user_permissions', 'players_playerdb_user_permissions') - db.rename_column('players_playerdb_user_permissions', 'playerdbtmp_id', 'playerdb_id') - - def backwards(self, orm): - db.rename_table('players_playerdb_groups', 'players_playerdbtmp_groups') - db.rename_column('players_playerdbtmp_groups', 'playerdb_id', 'playerdbtmp_id') - db.rename_table('players_playerdb_user_permissions', 'players_playerdbtmp_user_permissions') - db.rename_column('players_playerdbtmp_user_permissions', 'playerdb_id', 'playerdbtmp_id') - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'players.playerdbtmp': { - 'Meta': {'object_name': 'PlayerDBtmp'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0025_auto__add_db_liteattributes_db_tags.py b/src/players/migrations/0025_auto__add_db_liteattributes_db_tags.py deleted file mode 100644 index ad62bb2288..0000000000 --- a/src/players/migrations/0025_auto__add_db_liteattributes_db_tags.py +++ /dev/null @@ -1,117 +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 M2M table for field db_liteattributes on 'PlayerDB' - m2m_table_name = db.shorten_name(u'players_playerdb_db_liteattributes') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('playerdb', models.ForeignKey(orm[u'players.playerdb'], null=False)), - ('liteattribute', models.ForeignKey(orm[u'typeclasses.liteattribute'], null=False)) - )) - db.create_unique(m2m_table_name, ['playerdb_id', 'liteattribute_id']) - - # Adding M2M table for field db_tags on 'PlayerDB' - m2m_table_name = db.shorten_name(u'players_playerdb_db_tags') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('playerdb', models.ForeignKey(orm[u'players.playerdb'], null=False)), - ('tag', models.ForeignKey(orm[u'typeclasses.tag'], null=False)) - )) - db.create_unique(m2m_table_name, ['playerdb_id', 'tag_id']) - - - def backwards(self, orm): - # Removing M2M table for field db_liteattributes on 'PlayerDB' - db.delete_table(db.shorten_name(u'players_playerdb_db_liteattributes')) - - # Removing M2M table for field db_tags on 'PlayerDB' - db.delete_table(db.shorten_name(u'players_playerdb_db_tags')) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0026_auto__del_playernick__del_unique_playernick_db_nick_db_type_db_obj.py b/src/players/migrations/0026_auto__del_playernick__del_unique_playernick_db_nick_db_type_db_obj.py deleted file mode 100644 index f2b4a85b6c..0000000000 --- a/src/players/migrations/0026_auto__del_playernick__del_unique_playernick_db_nick_db_type_db_obj.py +++ /dev/null @@ -1,105 +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): - depends_on = (('typeclasses', '0004_copy_nicks_to_liteattrs_aliases_to_tags'),) - - def forwards(self, orm): - # Removing unique constraint on 'PlayerNick', fields ['db_nick', 'db_type', 'db_obj'] - db.delete_unique(u'players_playernick', ['db_nick', 'db_type', 'db_obj_id']) - - # Deleting model 'PlayerNick' - db.delete_table(u'players_playernick') - - - def backwards(self, orm): - # Adding model 'PlayerNick' - db.create_table(u'players_playernick', ( - ('db_type', self.gf('django.db.models.fields.CharField')(default='inputline', max_length=16, null=True, blank=True)), - ('db_nick', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'])), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_real', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal(u'players', ['PlayerNick']) - - # Adding unique constraint on 'PlayerNick', fields ['db_nick', 'db_type', 'db_obj'] - db.create_unique(u'players_playernick', ['db_nick', 'db_type', 'db_obj_id']) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] diff --git a/src/players/migrations/0027_move_permissions_to_handler.py b/src/players/migrations/0027_move_permissions_to_handler.py deleted file mode 100644 index 074244e711..0000000000 --- a/src/players/migrations/0027_move_permissions_to_handler.py +++ /dev/null @@ -1,95 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - Tag = orm['typeclasses.Tag'] - for obj in orm.PlayerDB.objects.all(): - if obj.db_permissions: - for perm in [perm.strip() for perm in obj.db_permissions.split(",")]: - tag = Tag.objects.filter(db_key=perm.lower().strip(), db_category="permissions") - if tag: - tag = tag[0] - else: - tag = Tag(db_key=perm.lower().strip(), db_category="permissions") - tag.save() - obj.db_tags.add(tag) - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] - symmetrical = True diff --git a/src/players/migrations/0028_auto__del_field_playerdb_db_permissions.py b/src/players/migrations/0028_auto__del_field_playerdb_db_permissions.py deleted file mode 100644 index 6d9f788d16..0000000000 --- a/src/players/migrations/0028_auto__del_field_playerdb_db_permissions.py +++ /dev/null @@ -1,86 +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): - # Deleting field 'PlayerDB.db_permissions' - db.delete_column(u'players_playerdb', 'db_permissions') - - - def backwards(self, orm): - # Adding field 'PlayerDB.db_permissions' - db.add_column(u'players_playerdb', 'db_permissions', - self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), - keep_default=False) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] \ No newline at end of file diff --git a/src/players/migrations/0029_auto__add_field_playerdb_db_is_bot.py b/src/players/migrations/0029_auto__add_field_playerdb_db_is_bot.py deleted file mode 100644 index 2f5c9d8c0c..0000000000 --- a/src/players/migrations/0029_auto__add_field_playerdb_db_is_bot.py +++ /dev/null @@ -1,91 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as 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 'PlayerDB.db_is_bot' - db.add_column(u'players_playerdb', 'db_is_bot', - self.gf('django.db.models.fields.BooleanField')(default=False), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'PlayerDB.db_is_bot' - db.delete_column(u'players_playerdb', 'db_is_bot') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_bot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['players'] \ No newline at end of file diff --git a/src/players/migrations/__init__.py b/src/players/migrations/__init__.py index e69de29bb2..40a96afc6f 100644 --- a/src/players/migrations/__init__.py +++ b/src/players/migrations/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/src/scripts/migrations/0001_initial.py b/src/scripts/migrations/0001_initial.py deleted file mode 100644 index e5a78a9b79..0000000000 --- a/src/scripts/migrations/0001_initial.py +++ /dev/null @@ -1,154 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - depends_on = ( - ('objects', '0001_initial'),) - - def forwards(self, orm): - - # Adding model 'ScriptAttribute' - db.create_table('scripts_scriptattribute', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_value', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - ('db_mode', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['scripts.ScriptDB'])), - )) - db.send_create_signal('scripts', ['ScriptAttribute']) - - # Adding model 'ScriptDB' - db.create_table('scripts_scriptdb', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_typeclass_path', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_permissions', self.gf('django.db.models.fields.CharField')(max_length=512, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_desc', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['objects.ObjectDB'], null=True, blank=True)), - ('db_interval', self.gf('django.db.models.fields.IntegerField')(default=-1)), - ('db_start_delay', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('db_repeats', self.gf('django.db.models.fields.IntegerField')(default=0)), - ('db_persistent', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('db_is_active', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal('scripts', ['ScriptDB']) - - - def backwards(self, orm): - - # Deleting model 'ScriptAttribute' - db.delete_table('scripts_scriptattribute') - - # Deleting model 'ScriptDB' - db.delete_table('scripts_scriptdb') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_mode': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'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': '512', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0002_auto__del_field_scriptattribute_db_mode.py b/src/scripts/migrations/0002_auto__del_field_scriptattribute_db_mode.py deleted file mode 100644 index d2822e03f4..0000000000 --- a/src/scripts/migrations/0002_auto__del_field_scriptattribute_db_mode.py +++ /dev/null @@ -1,195 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -from src.utils.dbserialize import to_pickle -try: - import cPickle as pickle -except ImportError: - import pickle -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - - -# overloading pickle to have it find the PackedDBobj in this module -import pickle - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -renametable = { - 'src.typeclasses.models': 'src.objects.migrations.0019_convert_attrdata', - 'PackedDBobject': 'PackedDBobject', -} - -def mapname(name): - if name in renametable: - return renametable[name] - return name - -def mapped_load_global(self): - module = mapname(self.readline()[:-1]) - name = mapname(self.readline()[:-1]) - klass = self.find_class(module, name) - self.append(klass) - -def loads(str): - file = StringIO(str) - unpickler = pickle.Unpickler(file) - unpickler.dispatch[pickle.GLOBAL] = mapped_load_global - return unpickler.load() - - - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Deleting field 'ScriptAttribute.db_mode' - - if not db.dry_run: - for attr in orm["scripts.ScriptAttribute"].objects.all(): - # resave attributes - db_mode = attr.db_mode - if db_mode and db_mode != 'pickle': - # an object. We need to resave this. - if db_mode == 'object': - val = PackedDBobject(attr.db_value, "objectdb") - elif db_mode == 'player': - val = PackedDBobject(attr.db_value, "playerdb") - elif db_mode == 'script': - val = PackedDBobject(attr.db_value, "scriptdb") - elif db_mode == 'help': - val = PackedDBobject(attr.db_value, "helpentry") - else: - val = PackedDBobject(attr.db_value, db_mode) # channel, msg - attr.value = val - - db.delete_column('scripts_scriptattribute', 'db_mode') - - - def backwards(self, orm): - - # Adding field 'ScriptAttribute.db_mode' - db.add_column('scripts_scriptattribute', 'db_mode', self.gf('django.db.models.fields.CharField')(max_length=20, null=True, blank=True), keep_default=False) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_cmdset_storage': ('django.db.models.fields.TextField', [], {'null': 'True'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'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': '512', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0003_auto__chg_field_scriptdb_db_lock_storage__chg_field_scriptdb_db_permis.py b/src/scripts/migrations/0003_auto__chg_field_scriptdb_db_lock_storage__chg_field_scriptdb_db_permis.py deleted file mode 100644 index e34c0f3223..0000000000 --- a/src/scripts/migrations/0003_auto__chg_field_scriptdb_db_lock_storage__chg_field_scriptdb_db_permis.py +++ /dev/null @@ -1,134 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ScriptDB.db_lock_storage' - db.alter_column('scripts_scriptdb', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'ScriptDB.db_permissions' - db.alter_column('scripts_scriptdb', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=255)) - - # Changing field 'ScriptAttribute.db_lock_storage' - db.alter_column('scripts_scriptattribute', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - - def backwards(self, orm): - - # Changing field 'ScriptDB.db_lock_storage' - db.alter_column('scripts_scriptdb', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - # Changing field 'ScriptDB.db_permissions' - db.alter_column('scripts_scriptdb', 'db_permissions', self.gf('django.db.models.fields.CharField')(max_length=512)) - - # Changing field 'ScriptAttribute.db_lock_storage' - db.alter_column('scripts_scriptattribute', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - '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_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_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'}) - }, - '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_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - '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'}), - '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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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_lock_storage': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - '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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0004_auto.py b/src/scripts/migrations/0004_auto.py deleted file mode 100644 index 4f6b80e46e..0000000000 --- a/src/scripts/migrations/0004_auto.py +++ /dev/null @@ -1,128 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding index on 'ScriptDB', fields ['db_key'] - db.create_index('scripts_scriptdb', ['db_key']) - - # Adding index on 'ScriptAttribute', fields ['db_key'] - db.create_index('scripts_scriptattribute', ['db_key']) - - - def backwards(self, orm): - - # Removing index on 'ScriptAttribute', fields ['db_key'] - db.delete_index('scripts_scriptattribute', ['db_key']) - - # Removing index on 'ScriptDB', fields ['db_key'] - db.delete_index('scripts_scriptdb', ['db_key']) - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0005_converting_attributes.py b/src/scripts/migrations/0005_converting_attributes.py deleted file mode 100644 index cfeb9cecee..0000000000 --- a/src/scripts/migrations/0005_converting_attributes.py +++ /dev/null @@ -1,491 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - import cPickle as pickle -except ImportError: - import pickle -from src.utils.utils import to_str, to_unicode -#from src.typeclasses.models import PackedDBobject,PackedDict,PackedList - -from django.contrib.contenttypes.models import ContentType -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -def from_attr(attr, datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.dbref_search(data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif dtype == PackedDBobject: - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return PackedDict(attr, dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()]))) - elif hasattr(item, '__iter__'): - return PackedList(attr, list(iter_id2db(val) for val in item)) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - for attr in orm.ScriptAttribute.objects.all(): - try: - # repack attr into new format, and reimport - val = pickle.loads(to_str(attr.db_value)) - if hasattr(val, '__iter__'): - val = ("iter", val) - elif type(val) == PackedDBobject: - val = ("dbobj", val) - else: - val = ("simple", val) - attr.db_value = to_unicode(pickle.dumps(to_str(to_attr(from_attr(attr, val))))) - attr.save() - except TypeError, RuntimeError: - pass - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0006_converting_attributes.py b/src/scripts/migrations/0006_converting_attributes.py deleted file mode 100644 index b6bc873a69..0000000000 --- a/src/scripts/migrations/0006_converting_attributes.py +++ /dev/null @@ -1,375 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - import cPickle as pickle -except ImportError: - import pickle -from src.utils.utils import to_str, to_unicode -#from src.typeclasses.models import PackedDBobject - -from django.contrib.contenttypes.models import ContentType -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - """ - self.db_obj = db_obj - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.db_obj.value = self - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.db_obj.value = self - def pop(self, *args, **kwargs): - "Custom pop" - super(PackedDict, self).pop(*args, **kwargs) - self.db_obj.value = self - def popitem(self, *args, **kwargs): - "Custom popitem" - super(PackedDict, self).popitem(*args, **kwargs) - self.db_obj.value = self - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.db_obj.value = self - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing list. - db_obj - the Attribute object storing this dict. - """ - self.db_obj = db_obj - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.db_obj.value = self - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.db_obj.value = self - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.db_obj.value = self - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.db_obj.value = self - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.db_obj.value = self - def pop(self, *args, **kwargs): - "Custom pop" - super(PackedList, self).pop(*args, **kwargs) - self.db_obj.value = self - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.db_obj.value = self - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.db_obj.value = self - - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - -def from_attr(attr, datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.dbref_search(data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif dtype == PackedDBobject: - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return attr, dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - for attr in orm.ScriptAttribute.objects.all(): - try: - # repack attr into new format, and reimport - val = pickle.loads(to_str(attr.db_value)) - attr.db_value = to_unicode(pickle.dumps(to_str(to_attr(from_attr(attr, val))))) - attr.save() - except TypeError, RuntimeError: - pass - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0007_typeclass_to_new_api_default.py b/src/scripts/migrations/0007_typeclass_to_new_api_default.py deleted file mode 100644 index faa1461701..0000000000 --- a/src/scripts/migrations/0007_typeclass_to_new_api_default.py +++ /dev/null @@ -1,129 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - - def forwards(self, orm): - "Write your forwards methods here." - try: - for obj in orm.ScriptDB.objects.all(): - if obj.db_typeclass_path == "game.gamesrc.scripts.basescript.Script": - obj.db_typeclass_path = "src.scripts.scripts.Script" - obj.save() - - except utils.DatabaseError: - "We are starting from scratch. Ignore." - pass - - def backwards(self, orm): - "Write your backwards methods here." - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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'}) - }, - '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_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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0008_auto__chg_field_scriptdb_db_lock_storage.py b/src/scripts/migrations/0008_auto__chg_field_scriptdb_db_lock_storage.py deleted file mode 100644 index 261b498b7b..0000000000 --- a/src/scripts/migrations/0008_auto__chg_field_scriptdb_db_lock_storage.py +++ /dev/null @@ -1,122 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ScriptDB.db_lock_storage' - db.alter_column('scripts_scriptdb', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'ScriptDB.db_lock_storage' - db.alter_column('scripts_scriptdb', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] \ No newline at end of file diff --git a/src/scripts/migrations/0009_auto__chg_field_scriptattribute_db_lock_storage.py b/src/scripts/migrations/0009_auto__chg_field_scriptattribute_db_lock_storage.py deleted file mode 100644 index 46000571e0..0000000000 --- a/src/scripts/migrations/0009_auto__chg_field_scriptattribute_db_lock_storage.py +++ /dev/null @@ -1,122 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Changing field 'ScriptAttribute.db_lock_storage' - db.alter_column('scripts_scriptattribute', 'db_lock_storage', self.gf('django.db.models.fields.TextField')()) - - def backwards(self, orm): - - # Changing field 'ScriptAttribute.db_lock_storage' - db.alter_column('scripts_scriptattribute', 'db_lock_storage', self.gf('django.db.models.fields.CharField')(max_length=512)) - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] \ No newline at end of file diff --git a/src/scripts/migrations/0010_add_picklefield.py b/src/scripts/migrations/0010_add_picklefield.py deleted file mode 100644 index 174e25419c..0000000000 --- a/src/scripts/migrations/0010_add_picklefield.py +++ /dev/null @@ -1,125 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Adding field 'ScriptAttribute.db_value2' - db.add_column('scripts_scriptattribute', 'db_value2', - self.gf('src.utils.picklefield.PickledObjectField')(null=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'ScriptAttribute.db_value2' - db.delete_column('scripts_scriptattribute', 'db_value2') - - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] \ No newline at end of file diff --git a/src/scripts/migrations/0011_convert_attrdata.py b/src/scripts/migrations/0011_convert_attrdata.py deleted file mode 100644 index 373467a495..0000000000 --- a/src/scripts/migrations/0011_convert_attrdata.py +++ /dev/null @@ -1,529 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -from django.contrib.contenttypes.models import ContentType - -from src.utils.utils import to_str -from src.utils.dbserialize import to_pickle -try: - import cPickle as pickle -except ImportError: - import pickle -CTYPEGET = ContentType.objects.get -GA = object.__getattribute__ -SA = object.__setattr__ -DA = object.__delattr__ - - -# overloading pickle to have it find the PackedDBobj in this module -import pickle - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -renametable = { - 'src.typeclasses.models': 'src.scripts.migrations.0011_convert_attrdata', - 'PackedDBobject': 'PackedDBobject', -} - -def mapname(name): - if name in renametable: - return renametable[name] - return name - -def mapped_load_global(self): - module = mapname(self.readline()[:-1]) - name = mapname(self.readline()[:-1]) - klass = self.find_class(module, name) - self.append(klass) - -def loads(str): - file = StringIO(str) - unpickler = pickle.Unpickler(file) - unpickler.dispatch[pickle.GLOBAL] = mapped_load_global - return unpickler.load() - - - -class PackedDBobject(object): - """ - Attribute helper class. - A container for storing and easily identifying database objects in - the database (which doesn't suppport storing db_objects directly). - """ - def __init__(self, ID, db_model, db_key): - self.id = ID - self.db_model = db_model - self.key = db_key - def __str__(self): - return "%s(#%s)" % (self.key, self.id) - def __unicode__(self): - return u"%s(#%s)" % (self.key, self.id) - -class PackedDict(dict): - """ - Attribute helper class. - A variant of dict that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - Sets up the packing dict. The db_store variable - is set by Attribute.validate_data() when returned in - order to allow custom updates to the dict. - - db_obj - the Attribute object storing this dict. - - The 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. Once initialization - is over, the Attribute from_attr() method will assign - the parent (or None, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedDict, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join("%s:%s" % (key, str(val)) for key, val in self.items()) - def save(self): - "Relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "assign item to this dict" - super(PackedDict, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[key]" - super(PackedDict, self).__delitem__(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Custom clear" - super(PackedDict, self).clear(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedDict, self).pop(*args, **kwargs) - self.save() - return ret - def popitem(self, *args, **kwargs): - "Custom popitem" - ret = super(PackedDict, self).popitem(*args, **kwargs) - self.save() - return ret - def setdefault(self, *args, **kwargs): - "Custom setdefault" - super(PackedDict, self).setdefault(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Custom update" - super(PackedDict, self).update(*args, **kwargs) - self.save() - -class PackedList(list): - """ - Attribute helper class. - A variant of list that stores itself to the database when - updating one of its keys. This is called and handled by - Attribute.validate_data(). - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing list. - db_obj - the attribute object storing this list. - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedList, self).__init__(*args, **kwargs) - def __str__(self): - return "[%s]" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def __setitem__(self, *args, **kwargs): - "Custom setitem that stores changed list to database." - super(PackedList, self).__setitem__(*args, **kwargs) - self.save() - def __delitem__(self, *args, **kwargs): - "delete with del self[index]" - super(PackedList, self).__delitem__(*args, **kwargs) - self.save() - def append(self, *args, **kwargs): - "Custom append" - super(PackedList, self).append(*args, **kwargs) - self.save() - def extend(self, *args, **kwargs): - "Custom extend" - super(PackedList, self).extend(*args, **kwargs) - self.save() - def insert(self, *args, **kwargs): - "Custom insert" - super(PackedList, self).insert(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Custom remove" - super(PackedList, self).remove(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Custom pop" - ret = super(PackedList, self).pop(*args, **kwargs) - self.save() - return ret - def reverse(self, *args, **kwargs): - "Custom reverse" - super(PackedList, self).reverse(*args, **kwargs) - self.save() - def sort(self, *args, **kwargs): - "Custom sort" - super(PackedList, self).sort(*args, **kwargs) - self.save() - -class PackedSet(set): - """ - A variant of Set that stores new updates to the databse. - """ - def __init__(self, db_obj, *args, **kwargs): - """ - sets up the packing set. - db_obj - the attribute object storing this set - - the 'parent' property is set to 'init' at creation, - this stops the system from saving itself over and over - when first assigning the dict. once initialization - is over, the attribute from_attr() method will assign - the parent (or none, if at the root) - - """ - self.db_obj = db_obj - self.parent = 'init' - super(PackedSet, self).__init__(*args, **kwargs) - def __str__(self): - return "{%s}" % ", ".join(str(val) for val in self) - def save(self): - "relay save operation upwards in tree until we hit the root." - if self.parent == 'init': - pass - elif self.parent: - self.parent.save() - else: - self.db_obj.value = self - def add(self, *args, **kwargs): - "Add an element to the set" - super(PackedSet, self).add(*args, **kwargs) - self.save() - def clear(self, *args, **kwargs): - "Remove all elements from this set" - super(PackedSet, self).clear(*args, **kwargs) - self.save() - def difference_update(self, *args, **kwargs): - "Remove all elements of another set from this set." - super(PackedSet, self).difference_update(*args, **kwargs) - self.save() - def discard(self, *args, **kwargs): - "Remove an element from a set if it is a member.\nIf not a member, do nothing." - super(PackedSet, self).discard(*args, **kwargs) - self.save() - def intersection_update(self, *args, **kwargs): - "Update a set with the intersection of itself and another." - super(PackedSet, self).intersection_update(*args, **kwargs) - self.save() - def pop(self, *args, **kwargs): - "Remove and return an arbitrary set element.\nRaises KeyError if the set is empty." - super(PackedSet, self).pop(*args, **kwargs) - self.save() - def remove(self, *args, **kwargs): - "Remove an element from a set; it must be a member.\nIf the element is not a member, raise a KeyError." - super(PackedSet, self).remove(*args, **kwargs) - self.save() - def symmetric_difference_update(self, *args, **kwargs): - "Update a set with the symmetric difference of itself and another." - super(PackedSet, self).symmetric_difference_update(*args, **kwargs) - self.save() - def update(self, *args, **kwargs): - "Update a set with the union of itself and others." - super(PackedSet, self).update(*args, **kwargs) - self.save() - -def to_attr(data): - """ - Convert data to proper attr data format before saving - - We have to make sure to not store database objects raw, since - this will crash the system. Instead we must store their IDs - and make sure to convert back when the attribute is read back - later. - - Due to this it's criticial that we check all iterables - recursively, converting all found database objects to a form - the database can handle. We handle lists, tuples and dicts - (and any nested combination of them) this way, all other - iterables are stored and returned as lists. - - data storage format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string or number - dbobj - a single dbobj - iter - any iterable object - will be looped over recursively - to convert dbobj->id. - - """ - - def iter_db2id(item): - """ - recursively looping through stored iterables, replacing objects with ids. - (Python only builds nested functions once, so there is no overhead for nesting) - """ - dtype = type(item) - if dtype in (basestring, int, float): # check the most common types first, for speed - return item - elif hasattr(item, "id") and hasattr(item, "db_model_name") and hasattr(item, "db_key"): - db_model_name = item.db_model_name - if db_model_name == "typeclass": - db_model_name = GA(item.dbobj, "db_model_name") - return PackedDBobject(item.id, db_model_name, item.db_key) - elif dtype == tuple: - return tuple(iter_db2id(val) for val in item) - elif dtype in (dict, PackedDict): - return dict((key, iter_db2id(val)) for key, val in item.items()) - elif hasattr(item, '__iter__'): - return list(iter_db2id(val) for val in item) - else: - return item - - dtype = type(data) - - if dtype in (basestring, int, float): - return ("simple",data) - elif hasattr(data, "id") and hasattr(data, "db_model_name") and hasattr(data, 'db_key'): - # all django models (objectdb,scriptdb,playerdb,channel,msg,typeclass) - # have the protected property db_model_name hardcoded on themselves for speed. - db_model_name = data.db_model_name - if db_model_name == "typeclass": - # typeclass cannot help us, we want the actual child object model name - db_model_name = GA(data.dbobj, "db_model_name") - return ("dbobj", PackedDBobject(data.id, db_model_name, data.db_key)) - elif hasattr(data, "__iter__"): - return ("iter", iter_db2id(data)) - else: - return ("simple", data) - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - - depends_on = ( - ("objects", "0018_add_picklefield"), - ) - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - # modified for migration - converts to plain python properties - def from_attr(datatuple): - """ - Retrieve data from a previously stored attribute. This - is always a dict with keys type and data. - - datatuple comes from the database storage and has - the following format: - (simple|dbobj|iter, ) - where - simple - a single non-db object, like a string. is returned as-is. - dbobj - a single dbobj-id. This id is retrieved back from the database. - iter - an iterable. This is traversed iteratively, converting all found - dbobj-ids back to objects. Also, all lists and dictionaries are - returned as their PackedList/PackedDict counterparts in order to - allow in-place assignment such as obj.db.mylist[3] = val. Mylist - is then a PackedList that saves the data on the fly. - """ - # nested functions - def id2db(data): - """ - Convert db-stored dbref back to object - """ - mclass = CTYPEGET(model=data.db_model).model_class() - try: - return mclass.objects.get(id=data.id) - - except AttributeError: - try: - return mclass.objects.get(id=data.id) - except mclass.DoesNotExist: # could happen if object was deleted in the interim. - return None - - def iter_id2db(item): - """ - Recursively looping through stored iterables, replacing ids with actual objects. - We return PackedDict and PackedLists instead of normal lists; this is needed in order for - the user to do dynamic saving of nested in-place, such as obj.db.attrlist[2]=3. What is - stored in the database are however always normal python primitives. - """ - dtype = type(item) - if dtype in (basestring, int, float, long, bool): # check the most common types first, for speed - return item - elif dtype == PackedDBobject or hasattr(item, '__class__') and item.__class__.__name__ == "PackedDBobject": - return id2db(item) - elif dtype == tuple: - return tuple([iter_id2db(val) for val in item]) - elif dtype in (dict, PackedDict): - return dict(zip([key for key in item.keys()], - [iter_id2db(val) for val in item.values()])) - elif hasattr(item, '__iter__'): - return list(iter_id2db(val) for val in item) - else: - return item - - typ, data = datatuple - - if typ == 'simple': - # single non-db objects - return data - elif typ == 'dbobj': - # a single stored dbobj - return id2db(data) - elif typ == 'iter': - # all types of iterables - return iter_id2db(data) - - if not db.dry_run: - for attr in orm['scripts.ScriptAttribute'].objects.all(): - # repack attr into new format and reimport - datatuple = loads(to_str(attr.db_value)) - python_data = from_attr(datatuple) - new_data = to_pickle(python_data) - attr.db_value2 = new_data # new pickleObjectField - attr.save() - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("This migration cannot be reversed.") - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] - symmetrical = True diff --git a/src/scripts/migrations/0012_remove_old_attr_value_field.py b/src/scripts/migrations/0012_remove_old_attr_value_field.py deleted file mode 100644 index 3d8a33a90e..0000000000 --- a/src/scripts/migrations/0012_remove_old_attr_value_field.py +++ /dev/null @@ -1,124 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting field 'ScriptAttribute.db_value' - db.delete_column('scripts_scriptattribute', 'db_value') - db.rename_column('scripts_scriptattribute', 'db_value2', 'db_value') - - def backwards(self, orm): - # Adding field 'ScriptAttribute.db_value' - db.add_column('scripts_scriptattribute', 'db_value', - self.gf('django.db.models.fields.TextField')(null=True, blank=True), - keep_default=False) - db.rename_column('scripts_scriptattribute', 'db_value', 'db_value2') - - 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'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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.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.TextField', [], {'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'}) - }, - '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.TextField', [], {'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['%s']" % user_orm_label, 'unique': 'True'}) - }, - 'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['scripts.ScriptDB']"}), - 'db_value2': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'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_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0013_auto__del_scriptattribute.py b/src/scripts/migrations/0013_auto__del_scriptattribute.py deleted file mode 100644 index 0891184daf..0000000000 --- a/src/scripts/migrations/0013_auto__del_scriptattribute.py +++ /dev/null @@ -1,143 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Deleting model 'ScriptAttribute' - db.delete_table(u'scripts_scriptattribute') - - # Adding M2M table for field db_attributes on 'ScriptDB' - db.create_table(u'scripts_scriptdb_db_attributes', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('scriptdb', models.ForeignKey(orm[u'scripts.scriptdb'], null=False)), - ('attribute', models.ForeignKey(orm[u'typeclasses.attribute'], null=False)) - )) - db.create_unique(u'scripts_scriptdb_db_attributes', ['scriptdb_id', 'attribute_id']) - - - def backwards(self, orm): - # Adding model 'ScriptAttribute' - db.create_table(u'scripts_scriptattribute', ( - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_value2', self.gf('src.utils.picklefield.PickledObjectField')(null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_obj', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['scripts.ScriptDB'])), - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal('scripts', ['ScriptAttribute']) - - # Removing M2M table for field db_attributes on 'ScriptDB' - db.delete_table('scripts_scriptdb_db_attributes') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] \ No newline at end of file diff --git a/src/scripts/migrations/0014_create_db_liteattributes_db_tags.py b/src/scripts/migrations/0014_create_db_liteattributes_db_tags.py deleted file mode 100644 index a7a68c5601..0000000000 --- a/src/scripts/migrations/0014_create_db_liteattributes_db_tags.py +++ /dev/null @@ -1,146 +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 M2M table for field db_liteattributes on 'ScriptDB' - m2m_table_name = db.shorten_name(u'scripts_scriptdb_db_liteattributes') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('scriptdb', models.ForeignKey(orm[u'scripts.scriptdb'], null=False)), - ('liteattribute', models.ForeignKey(orm[u'typeclasses.liteattribute'], null=False)) - )) - db.create_unique(m2m_table_name, ['scriptdb_id', 'liteattribute_id']) - - # Adding M2M table for field db_tags on 'ScriptDB' - m2m_table_name = db.shorten_name(u'scripts_scriptdb_db_tags') - db.create_table(m2m_table_name, ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('scriptdb', models.ForeignKey(orm[u'scripts.scriptdb'], null=False)), - ('tag', models.ForeignKey(orm[u'typeclasses.tag'], null=False)) - )) - db.create_unique(m2m_table_name, ['scriptdb_id', 'tag_id']) - - - def backwards(self, orm): - # Removing M2M table for field db_liteattributes on 'ScriptDB' - db.delete_table(db.shorten_name(u'scripts_scriptdb_db_liteattributes')) - - # Removing M2M table for field db_tags on 'ScriptDB' - db.delete_table(db.shorten_name(u'scripts_scriptdb_db_tags')) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_location': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locations_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] diff --git a/src/scripts/migrations/0015_move_permissions_to_handler.py b/src/scripts/migrations/0015_move_permissions_to_handler.py deleted file mode 100644 index b3a764e0f1..0000000000 --- a/src/scripts/migrations/0015_move_permissions_to_handler.py +++ /dev/null @@ -1,130 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - Tag = orm['typeclasses.Tag'] - for obj in orm.ScriptDB.objects.all(): - if obj.db_permissions: - for perm in [perm.strip() for perm in obj.db_permissions.split(",")]: - tag = Tag.objects.filter(db_key=perm.lower().strip(), db_category="permissions") - if tag: - tag = tag[0] - else: - tag = Tag(db_key=perm.lower().strip(), db_category="permissions") - tag.save() - obj.db_tags.add(tag) - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] - symmetrical = True diff --git a/src/scripts/migrations/0016_auto__del_field_scriptdb_db_permissions.py b/src/scripts/migrations/0016_auto__del_field_scriptdb_db_permissions.py deleted file mode 100644 index db903975a0..0000000000 --- a/src/scripts/migrations/0016_auto__del_field_scriptdb_db_permissions.py +++ /dev/null @@ -1,119 +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): - # Deleting field 'ScriptDB.db_permissions' - db.delete_column(u'scripts_scriptdb', 'db_permissions') - - - def backwards(self, orm): - # Adding field 'ScriptDB.db_permissions' - db.add_column(u'scripts_scriptdb', 'db_permissions', - self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), - keep_default=False) - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] \ No newline at end of file diff --git a/src/scripts/migrations/0017_auto__add_field_scriptdb_db_player.py b/src/scripts/migrations/0017_auto__add_field_scriptdb_db_player.py deleted file mode 100644 index 2c497aa84f..0000000000 --- a/src/scripts/migrations/0017_auto__add_field_scriptdb_db_player.py +++ /dev/null @@ -1,125 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as 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 'ScriptDB.db_player' - db.add_column(u'scripts_scriptdb', 'db_player', - self.gf('django.db.models.fields.related.ForeignKey')(to=orm['players.PlayerDB'], null=True, blank=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'ScriptDB.db_player' - db.delete_column(u'scripts_scriptdb', 'db_player_id') - - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_bot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['scripts'] \ No newline at end of file diff --git a/src/scripts/migrations/__init__.py b/src/scripts/migrations/__init__.py index e69de29bb2..40a96afc6f 100644 --- a/src/scripts/migrations/__init__.py +++ b/src/scripts/migrations/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/src/server/migrations/0001_rename_config_table_to_server_table.py b/src/server/migrations/0001_rename_config_table_to_server_table.py deleted file mode 100644 index 1cb74eb81c..0000000000 --- a/src/server/migrations/0001_rename_config_table_to_server_table.py +++ /dev/null @@ -1,55 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models, utils -import pickle - -HAS_CONFIGVAL = True -try: from src.server.models import ConfigValue -except ImportError: HAS_CONFIGVAL = False -HAS_SERVERCONF = True -try: from src.server.models import ServerConfig -except ImportError: HAS_SERVERCONF = False - -class Migration(SchemaMigration): - - no_dry_run = True - def forwards(self, orm): - if HAS_CONFIGVAL:# and not HAS_SERVERCONF: - # this means we have to rename the old one - db.rename_table("config_configvalue", "server_serverconfig") - for conf in orm.ServerConfig.objects.all(): - conf.db_value = pickle.dumps(conf.db_value) - conf.save() - else:# not HAS_SERVERCONF: - # this will happen if we start db from scratch (the config - # app will then already be gone and no data is to be transferred) - # So instead of renaming the old we instead have to manually create the new model. - # Adding model 'ServerConfig' - db.create_table('server_serverconfig', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=64)), - ('db_value', self.gf('django.db.models.fields.TextField')(blank=True)), - )) - db.send_create_signal('server', ['ServerConfig']) - - def backwards(self, orm): - raise RuntimeError("This migration cannot be reversed.") - - models = { - 'config.configvalue': { - 'Meta': {'object_name': 'ConfigValue'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), - 'db_value': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'server.serverconfig': { - 'Meta': {'object_name': 'ServerConfig'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), - 'db_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['config', 'server'] diff --git a/src/server/migrations/0002_fix_config_value.py b/src/server/migrations/0002_fix_config_value.py deleted file mode 100644 index a5da54880d..0000000000 --- a/src/server/migrations/0002_fix_config_value.py +++ /dev/null @@ -1,132 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, utils -import pickle - - -class Migration(DataMigration): - - def forwards(self, orm): - "Write your forwards methods here." - - # we are fixing a situation were the serverconfig value last_initial_setup_step was left at 1 instead of -1 - # as it should (due to a bug in the setter). This causes db errors as the initial_setup thinks it needs to - # run again. - - try: - if orm['objects.ObjectDB'].objects.filter(id=1) and orm["objects.ObjectDB"].objects.filter(id=2): - # only an issue the critical objects have already been created - conf = orm.ServerConfig.objects.filter(db_key="last_initial_setup_step") - if conf: - conf = conf[0] - if pickle.loads(str(conf.db_value)) == 1: - # this shouldn't be 1 if objects already exists. This is the bug. Fix the error. - conf.db_value = pickle.dumps(-1) - conf.save() - except utils.DatabaseError: - # this will happen if we start the db from scratch (in which case this migration fix is not needed) - db.commit_transaction() - db.start_transaction() - pass - - - def backwards(self, orm): - "Write your backwards methods here." - - - 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_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'objects.nick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'Nick'}, - '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'}) - }, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'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.TextField', [], {'null': '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_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.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - '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_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['objects.ObjectDB']", 'null': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '512', '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'}) - }, - 'server.serverconfig': { - 'Meta': {'object_name': 'ServerConfig'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), - 'db_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects', 'server'] diff --git a/src/server/migrations/0003_add_tmpattr.py b/src/server/migrations/0003_add_tmpattr.py deleted file mode 100644 index 19b8019fd9..0000000000 --- a/src/server/migrations/0003_add_tmpattr.py +++ /dev/null @@ -1,48 +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 model 'TmpAttribute' - db.create_table(u'server_tmpattribute', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_value', self.gf('src.utils.picklefield.PickledObjectField')(null=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_obj_id', self.gf('django.db.models.fields.IntegerField')(null=True)), - ('db_obj_type', self.gf('django.db.models.fields.CharField')(max_length=10, null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(editable=True, auto_now_add=False)), - )) - db.send_create_signal('server', ['TmpAttribute']) - - - def backwards(self, orm): - # Deleting model 'TmpAttribute' - db.delete_table(u'server_tmpattribute') - - - models = { - u'server.serverconfig': { - 'Meta': {'object_name': 'ServerConfig'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), - 'db_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'server.tmpattribute': { - 'Meta': {'object_name': 'TmpAttribute'}, - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_obj_type': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'db_date_created':('django.db.models.fields.DateTimeField',[],{'editable':'True', 'auto_now_add':'True'}), - } - } - - complete_apps = ['server'] diff --git a/src/server/migrations/0004_store_all_attrs.py b/src/server/migrations/0004_store_all_attrs.py deleted file mode 100644 index 39e2343e4c..0000000000 --- a/src/server/migrations/0004_store_all_attrs.py +++ /dev/null @@ -1,208 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models -#from src.utils.dbserialize import to_pickle, from_pickle - -class Migration(DataMigration): - "Store all attributes in a temporary table" - depends_on = (('objects', '0020_remove_old_attr_value_field'), - ('players','0019_remove_old_attr_value_field'), - ('scripts','0012_remove_old_attr_value_field')) - no_dry_run = True - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - # store ObjectAttributes - for attrobj in orm['objects.ObjAttribute'].objects.all(): - #value = from_pickle(attrobj.db_value, db_obj=attrobj) - new_attr = orm['server.TmpAttribute'](db_key=attrobj.db_key, - db_value=attrobj.db_value, - db_lock_storage=attrobj.db_lock_storage, - db_obj_id=attrobj.db_obj.id, - db_obj_type="objectdb", - db_date_created=attrobj.db_date_created) - new_attr.save() - #new_attr.db_value = to_pickle(value) - #new_attr.save() - - # store PlayerAttributes - for attrobj in orm['players.PlayerAttribute'].objects.all(): - #value = from_pickle(attrobj.db_value, db_obj=attrobj) - new_attr = orm['server.TmpAttribute'](db_key=attrobj.db_key, - db_value=attrobj.db_value, - db_lock_storage=attrobj.db_lock_storage, - db_obj_id=attrobj.db_obj.id, - db_obj_type="playerdb", - db_date_created=attrobj.db_date_created) - new_attr.save() - #new_attr.db_value = to_pickle(value) - #new_attr.save() - - # store ScriptAttributes - for attrobj in orm['scripts.ScriptAttribute'].objects.all(): - #value = from_pickle(attrobj.db_value, db_obj=attrobj) - new_attr = orm['server.TmpAttribute'](db_key=attrobj.db_key, - db_value=attrobj.db_value, - db_lock_storage=attrobj.db_lock_storage, - db_obj_id=attrobj.db_obj.id, - db_obj_type="scriptdb", - db_date_created=attrobj.db_date_created) - new_attr.save() - #new_attr.db_value = to_pickle(value) - #new_attr.save() - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'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': u"orm['objects.ObjectDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']"}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerattribute': { - 'Meta': {'object_name': 'PlayerAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'unique': 'True'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'scripts.scriptattribute': { - 'Meta': {'object_name': 'ScriptAttribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['scripts.ScriptDB']"}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'server.serverconfig': { - 'Meta': {'object_name': 'ServerConfig'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), - 'db_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'server.tmpattribute': { - 'Meta': {'object_name': 'TmpAttribute'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'editable':'True','auto_now_add': 'False', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_obj_type': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects', 'players', 'scripts', 'server'] - symmetrical = True diff --git a/src/server/migrations/0005_auto__del_tmpattribute.py b/src/server/migrations/0005_auto__del_tmpattribute.py deleted file mode 100644 index 7eab5ae376..0000000000 --- a/src/server/migrations/0005_auto__del_tmpattribute.py +++ /dev/null @@ -1,39 +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): - depends_on = (('typeclasses', '0002_resave_attrs'),) - - def forwards(self, orm): - # Deleting model 'TmpAttribute' - db.delete_table(u'server_tmpattribute') - - - def backwards(self, orm): - # Adding model 'TmpAttribute' - db.create_table(u'server_tmpattribute', ( - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_obj_id', self.gf('django.db.models.fields.IntegerField')(null=True)), - ('db_obj_type', self.gf('django.db.models.fields.CharField')(max_length=10, null=True)), - ('db_value', self.gf('src.utils.picklefield.PickledObjectField')(null=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=False, editable=True, blank=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal('server', ['TmpAttribute']) - - - models = { - u'server.serverconfig': { - 'Meta': {'object_name': 'ServerConfig'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), - 'db_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['server'] diff --git a/src/server/migrations/__init__.py b/src/server/migrations/__init__.py index e69de29bb2..40a96afc6f 100644 --- a/src/server/migrations/__init__.py +++ b/src/server/migrations/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/src/typeclasses/migrations/0001_initial.py b/src/typeclasses/migrations/0001_initial.py deleted file mode 100644 index bc6777daab..0000000000 --- a/src/typeclasses/migrations/0001_initial.py +++ /dev/null @@ -1,38 +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 model 'Attribute' - db.create_table(u'typeclasses_attribute', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)), - ('db_value', self.gf('src.utils.picklefield.PickledObjectField')(null=True)), - ('db_lock_storage', self.gf('django.db.models.fields.TextField')(blank=True)), - ('db_date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), - )) - db.send_create_signal(u'typeclasses', ['Attribute']) - - - def backwards(self, orm): - # Deleting model 'Attribute' - db.delete_table(u'typeclasses_attribute') - - - models = { - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['typeclasses'] \ No newline at end of file diff --git a/src/typeclasses/migrations/0002_resave_attrs.py b/src/typeclasses/migrations/0002_resave_attrs.py deleted file mode 100644 index 355d1cd2b9..0000000000 --- a/src/typeclasses/migrations/0002_resave_attrs.py +++ /dev/null @@ -1,197 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -try: - from django.contrib.auth import get_user_model -except ImportError: # django < 1.5 - from django.contrib.auth.models import User -else: - User = get_user_model() - -user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name) -user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name) -user_ptr_name = '%s_ptr' % User._meta.object_name.lower() - -class Migration(DataMigration): - depends_on = (('server', '0004_store_all_attrs'), - ('objects', '0021_auto__del_objattribute'), - ('players', '0020_auto__del_playerattribute'), - ('scripts', '0013_auto__del_scriptattribute')) - no_dry_run=True - def forwards(self, orm): - "Write your forwards methods here." - # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." - - for tmpattr in orm['server.TmpAttribute'].objects.all(): - typ = tmpattr.db_obj_type - dbid = tmpattr.db_obj_id - if typ == 'objectdb': - try: - dbobj = orm['objects.ObjectDB'].objects.get(id=dbid) - except: - print "could not find objid %i" % dbid - continue - elif typ == 'playerdb': - try: - dbobj = orm['players.PlayerDB'].objects.get(id=dbid) - except: - print "could not find objid %i" % dbid - continue - elif typ == 'scriptdb': - try: - dbobj = orm['scripts.ScriptDB'].objects.get(id=dbid) - except: - print "could not find objid %i" % dbid - continue - else: - print "Wrong object type to store on: %s" % typ - continue - dbattr = orm['typeclasses.Attribute'](db_key=tmpattr.db_key, - db_value=tmpattr.db_value, - db_lock_storage=tmpattr.db_lock_storage, - db_date_created=tmpattr.db_date_created) - - dbattr.save() - dbobj.db_attributes.add(dbattr) - - - def backwards(self, orm): - "Write your backwards methods here." - raise RuntimeError("Cannot revert this migration.") - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - user_model_label: { - 'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table}, - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'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'}), - u'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'}) - }, - u'server.serverconfig': { - 'Meta': {'object_name': 'ServerConfig'}, - 'db_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}), - 'db_value': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - 'server.tmpattribute': { - 'Meta': {'object_name': 'TmpAttribute'}, - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj_id': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_obj_type': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"orm['objects.ObjectDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_orm_label, 'unique': 'True'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['server', 'typeclasses', 'objects', 'scripts', 'players'] - symmetrical = True diff --git a/src/typeclasses/migrations/0003_auto__add_liteattribute__add_index_liteattribute_db_key_db_category__a.py b/src/typeclasses/migrations/0003_auto__add_liteattribute__add_index_liteattribute_db_key_db_category__a.py deleted file mode 100644 index a624ab0a1b..0000000000 --- a/src/typeclasses/migrations/0003_auto__add_liteattribute__add_index_liteattribute_db_key_db_category__a.py +++ /dev/null @@ -1,81 +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 model 'LiteAttribute' - db.create_table(u'typeclasses_liteattribute', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_category', self.gf('django.db.models.fields.CharField')(max_length=64, null=True, blank=True)), - ('db_data', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal(u'typeclasses', ['LiteAttribute']) - - # Adding index on 'LiteAttribute', fields ['db_key', 'db_category'] - db.create_index(u'typeclasses_liteattribute', ['db_key', 'db_category']) - - # Adding model 'Tag' - db.create_table(u'typeclasses_tag', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), - ('db_category', self.gf('django.db.models.fields.CharField')(max_length=64, null=True)), - ('db_data', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), - )) - db.send_create_signal(u'typeclasses', ['Tag']) - - # Adding unique constraint on 'Tag', fields ['db_key', 'db_category'] - db.create_unique(u'typeclasses_tag', ['db_key', 'db_category']) - - # Adding index on 'Tag', fields ['db_key', 'db_category'] - db.create_index(u'typeclasses_tag', ['db_key', 'db_category']) - - - def backwards(self, orm): - # Removing index on 'Tag', fields ['db_key', 'db_category'] - db.delete_index(u'typeclasses_tag', ['db_key', 'db_category']) - - # Removing unique constraint on 'Tag', fields ['db_key', 'db_category'] - db.delete_unique(u'typeclasses_tag', ['db_key', 'db_category']) - - # Removing index on 'LiteAttribute', fields ['db_key', 'db_category'] - db.delete_index(u'typeclasses_liteattribute', ['db_key', 'db_category']) - - # Deleting model 'LiteAttribute' - db.delete_table(u'typeclasses_liteattribute') - - # Deleting model 'Tag' - db.delete_table(u'typeclasses_tag') - - - models = { - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['typeclasses'] diff --git a/src/typeclasses/migrations/0004_copy_nicks_to_liteattrs_aliases_to_tags.py b/src/typeclasses/migrations/0004_copy_nicks_to_liteattrs_aliases_to_tags.py deleted file mode 100644 index 80ae81d88c..0000000000 --- a/src/typeclasses/migrations/0004_copy_nicks_to_liteattrs_aliases_to_tags.py +++ /dev/null @@ -1,177 +0,0 @@ -# -*- coding: utf-8 -*- -import datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models, IntegrityError - - -class Migration(DataMigration): - - depends_on = (("objects", "0022_add_db_liteattributes_db_tags"), - ("players", "0025_auto__add_db_liteattributes_db_tags")) - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - - # Each alias and nick is its own case. By default, this function starts - # in a transaction, so we'll close that and make our own transactions. - - for alias in orm['objects.Alias'].objects.all(): - # convert all Aliases to tags - try: - tag = orm.Tag.objects.get(db_key=alias.db_key, db_category="object_alias") - except orm.Tag.DoesNotExist: - tag = orm.Tag(db_key=alias.db_key, db_category="object_alias", db_data=None) - tag.save() - obj = alias.db_obj - obj.db_tags.add(tag) - # convert all nicks to LiteAttrs - for nick in orm['objects.ObjectNick'].objects.all(): - lattr = orm.LiteAttribute(db_key=nick.db_nick, db_category="object_nick_%s" % nick.db_type, db_data=nick.db_real) - lattr.save() - obj = nick.db_obj - obj.db_liteattributes.add(lattr) - for nick in orm['players.PlayerNick'].objects.all(): - lattr = orm.LiteAttribute(db_key=nick.db_nick, db_category="player_nick_%s" % nick.db_type, db_data=nick.db_real) - lattr.save() - obj = nick.db_obj - obj.db_liteattributes.add(lattr) - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'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'}), - u'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'}) - }, - u'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': u"orm['objects.ObjectDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_location': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'locations_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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': u"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'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'players.playernick': { - 'Meta': {'unique_together': "(('db_nick', 'db_type', 'db_obj'),)", 'object_name': 'PlayerNick'}, - 'db_nick': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - 'db_real': ('django.db.models.fields.TextField', [], {}), - 'db_type': ('django.db.models.fields.CharField', [], {'default': "'inputline'", 'max_length': '16', 'null': 'True', 'blank': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), - 'db_liteattributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.LiteAttribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_permissions': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - '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.TextField', [], {'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects', 'scripts', 'players', 'typeclasses'] - symmetrical = True diff --git a/src/typeclasses/migrations/0005_auto__add_field_attribute_db_strvalue__add_field_attribute_db_category.py b/src/typeclasses/migrations/0005_auto__add_field_attribute_db_strvalue__add_field_attribute_db_category.py deleted file mode 100644 index eeb79bc006..0000000000 --- a/src/typeclasses/migrations/0005_auto__add_field_attribute_db_strvalue__add_field_attribute_db_category.py +++ /dev/null @@ -1,69 +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 'Attribute.db_strvalue' - db.add_column(u'typeclasses_attribute', 'db_strvalue', - self.gf('django.db.models.fields.TextField')(null=True, blank=True), - keep_default=False) - - # Adding field 'Attribute.db_category' - db.add_column(u'typeclasses_attribute', 'db_category', - self.gf('django.db.models.fields.CharField')(db_index=True, max_length=128, null=True, blank=True), - keep_default=False) - - # Adding index on 'Tag', fields ['db_category'] - db.create_index(u'typeclasses_tag', ['db_category']) - - # Adding index on 'Tag', fields ['db_key'] - db.create_index(u'typeclasses_tag', ['db_key']) - - - def backwards(self, orm): - # Removing index on 'Tag', fields ['db_key'] - db.delete_index(u'typeclasses_tag', ['db_key']) - - # Removing index on 'Tag', fields ['db_category'] - db.delete_index(u'typeclasses_tag', ['db_category']) - - # Deleting field 'Attribute.db_strvalue' - db.delete_column(u'typeclasses_attribute', 'db_strvalue') - - # Deleting field 'Attribute.db_category' - db.delete_column(u'typeclasses_attribute', 'db_category') - - - models = { - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.liteattribute': { - 'Meta': {'object_name': 'LiteAttribute', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['typeclasses'] \ No newline at end of file diff --git a/src/typeclasses/migrations/0006_auto__del_liteattribute__del_index_liteattribute_db_key_db_category.py b/src/typeclasses/migrations/0006_auto__del_liteattribute__del_index_liteattribute_db_key_db_category.py deleted file mode 100644 index 2f7686f38e..0000000000 --- a/src/typeclasses/migrations/0006_auto__del_liteattribute__del_index_liteattribute_db_key_db_category.py +++ /dev/null @@ -1,52 +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): - - depends_on = (("scripts", "0014_create_db_liteattributes_db_tags"), - ("objects", "0022_add_db_liteattributes_db_tags"), - ("players", "0025_auto__add_db_liteattributes_db_tags")) - - def forwards(self, orm): - # Deleting model 'LiteAttribute' - db.delete_table(u'typeclasses_liteattribute') - - def backwards(self, orm): - # Adding index on 'LiteAttribute', fields ['db_key', 'db_category'] - db.create_index(u'typeclasses_liteattribute', ['db_key', 'db_category']) - - # Adding model 'LiteAttribute' - db.create_table(u'typeclasses_liteattribute', ( - ('db_category', self.gf('django.db.models.fields.CharField')(max_length=64, null=True, blank=True)), - ('db_key', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('db_data', self.gf('django.db.models.fields.TextField')()), - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - )) - db.send_create_signal(u'typeclasses', ['LiteAttribute']) - - - models = { - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['typeclasses'] diff --git a/src/typeclasses/migrations/0007_auto__add_field_attribute_db_model__add_field_attribute_db_attrype__ad.py b/src/typeclasses/migrations/0007_auto__add_field_attribute_db_model__add_field_attribute_db_attrype__ad.py deleted file mode 100644 index 1edcf252bb..0000000000 --- a/src/typeclasses/migrations/0007_auto__add_field_attribute_db_model__add_field_attribute_db_attrype__ad.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as 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 'Attribute.db_model' - db.add_column(u'typeclasses_attribute', 'db_model', - self.gf('django.db.models.fields.CharField')(db_index=True, max_length=32, null=True, blank=True), - keep_default=False) - - # Adding field 'Attribute.db_attrtype' - db.add_column(u'typeclasses_attribute', 'db_attrtype', - self.gf('django.db.models.fields.CharField')(db_index=True, max_length=16, null=True, blank=True), - keep_default=False) - - # Adding field 'Tag.db_model' - db.add_column(u'typeclasses_tag', 'db_model', - self.gf('django.db.models.fields.CharField')(max_length=32, null=True, db_index=True), - keep_default=False) - - # Adding field 'Tag.db_tagtype' - db.add_column(u'typeclasses_tag', 'db_tagtype', - self.gf('django.db.models.fields.CharField')(max_length=16, null=True, db_index=True), - keep_default=False) - - - def backwards(self, orm): - # Deleting field 'Attribute.db_model' - db.delete_column(u'typeclasses_attribute', 'db_model') - - # Deleting field 'Attribute.db_attrtype' - db.delete_column(u'typeclasses_attribute', 'db_attrtype') - - # Deleting field 'Tag.db_model' - db.delete_column(u'typeclasses_tag', 'db_model') - - # Deleting field 'Tag.db_tagtype' - db.delete_column(u'typeclasses_tag', 'db_tagtype') - - - models = { - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['typeclasses'] diff --git a/src/typeclasses/migrations/0008_converting_tags_attribute_categories.py b/src/typeclasses/migrations/0008_converting_tags_attribute_categories.py deleted file mode 100644 index 4816701477..0000000000 --- a/src/typeclasses/migrations/0008_converting_tags_attribute_categories.py +++ /dev/null @@ -1,264 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import DataMigration -from django.db import models - -class Migration(DataMigration): - - depends_on = (("comms", "0017_renaming_typeclass_from_comm_to_channel"), ) - - def forwards(self, orm): - "Write your forwards methods here." - # Note: Don't use "from appname.models import ModelName". - # Use orm.ModelName to refer to models in this application, - # and orm['appname.ModelName'] for models in other applications. - - for obj in orm['objects.ObjectDB'].objects.all(): - # object-attributes - for attr in obj.db_attributes.all(): - cat = attr.db_category or "" - if cat.startswith("nick_"): - attr.db_category = cat.split("nick_", 1)[1] - attr.db_attrtype = "nick" - attr.db_model = "objects.objectdb" - attr.save() - # object-tags - for tag in obj.db_tags.all(): - # split info stored in category into separate fields - tag.db_model = "objects.objectdb" - cat = tag.db_category or "" - if cat.startswith("object"): - cat = cat.split("object", 1)[1] - if cat.startswith("alias"): - tag.db_tagtype = "alias" - cat = cat.split("alias", 1)[1] - if cat.startswith("permission"): - tag.db_tagtype = "permission" - cat = cat.split("permission", 1)[1] - tag.db_category = cat - tag.save() - - for player in orm['players.PlayerDB'].objects.all(): - # player-attributes - for attr in player.db_attributes.all(): - cat = attr.db_category or "" - if cat.startswith("nick_"): - attr.db_category = cat.split("nick_", 1)[1] - attr.db_attrtype = "nick" - attr.db_model = "players.playerdb" - attr.save() - # player-tags - for tag in player.db_tags.all(): - # split info stored in category into separate fields - tag.db_model = "players.playerdb" - cat = tag.db_category or "" - if cat.startswith("player"): - cat = cat.split("player", 1)[1] - if cat.startswith("alias"): - tag.db_tagtype = "alias" - cat = cat.split("alias", 1)[1] - if cat.startswith("permission"): - tag.db_tagtype = "permission" - cat = cat.split("permission", 1)[1] - tag.db_category = cat - tag.save() - - for script in orm['scripts.ScriptDB'].objects.all(): - # script-attributes - for attr in script.db_attributes.all(): - cat = attr.db_category or "" - if cat.startswith("nick_"): - attr.db_category = cat.split("nick_", 1)[1] - attr.db_attrtype = "nick" - attr.db_model = "scripts.scriptdb" - attr.save() - # script-tags - for tag in script.db_tags.all(): - # split info stored in category into separate fields - tag.db_model = "scripts.scriptdb" - cat = tag.db_category or "" - if cat.startswith("script"): - cat = cat.split("script", 1)[1] - if cat.startswith("alias"): - tag.db_tagtype = "alias" - cat = cat.split("alias", 1)[1] - if cat.startswith("permission"): - tag.db_tagtype = "permission" - cat = cat.split("permission", 1)[1] - tag.db_category = cat - tag.save() - - for channel in orm['comms.ChannelDB'].objects.all(): - # comm-attributes - for attr in channel.db_attributes.all(): - cat = attr.db_category or "" - if cat.startswith("nick_"): - attr.db_category = cat.split("nick_", 1)[1] - attr.db_attrtype = "nick" - attr.db_model = "comms.channeldb" - attr.save() - # comm-tags - for tag in channel.db_tags.all(): - # split info stored in category into separate fields - tag.db_model = "comms.channeldb" - cat = tag.db_category or "" - if cat.startswith("comms"): - cat = cat.split("comms", 1)[1] - if cat.startswith("alias"): - tag.db_tagtype = "alias" - cat = cat.split("alias", 1)[1] - if cat.startswith("permission"): - tag.db_tagtype = "permission" - cat = cat.split("permission", 1)[1] - tag.db_category = cat - tag.save() - - def backwards(self, orm): - "Write your backwards methods here." - - models = { - u'auth.group': { - 'Meta': {'object_name': 'Group'}, - u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - u'auth.permission': { - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - u'comms.channeldb': { - 'Meta': {'object_name': 'ChannelDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.externalchannelconnection': { - 'Meta': {'object_name': 'ExternalChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_external_config': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_external_key': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'db_external_send_code': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_is_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.msg': { - 'Meta': {'object_name': 'Msg'}, - 'db_date_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), - 'db_header': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_hide_from_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_channels_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_hide_from_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_objects_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_hide_from_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'hide_from_players_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_message': ('django.db.models.fields.TextField', [], {}), - 'db_receivers_channels': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'channel_set'", 'null': 'True', 'to': u"orm['comms.ChannelDB']"}), - 'db_receivers_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_object_set'", 'null': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_receivers_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'receiver_player_set'", 'null': 'True', 'to': u"orm['players.PlayerDB']"}), - 'db_sender_external': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_sender_objects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_object_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['objects.ObjectDB']"}), - 'db_sender_players': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'sender_player_set'", 'null': 'True', 'db_index': 'True', 'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'comms.playerchannelconnection': { - 'Meta': {'object_name': 'PlayerChannelConnection'}, - 'db_channel': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['comms.ChannelDB']"}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']"}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'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'}), - u'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'}) - }, - u'objects.objectdb': { - 'Meta': {'object_name': 'ObjectDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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': u"orm['objects.ObjectDB']"}), - 'db_home': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'homes_set'", 'null': 'True', 'to': u"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': u"orm['objects.ObjectDB']"}), - 'db_lock_storage': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'db_player': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['players.PlayerDB']", 'null': 'True', 'blank': 'True'}), - 'db_sessid': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'players.playerdb': { - 'Meta': {'object_name': 'PlayerDB'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - '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.TextField', [], {'blank': 'True'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - '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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), - u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - u'scripts.scriptdb': { - 'Meta': {'object_name': 'ScriptDB'}, - 'db_attributes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Attribute']", 'null': 'True', 'symmetrical': 'False'}), - 'db_date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), - 'db_desc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'db_interval': ('django.db.models.fields.IntegerField', [], {'default': '-1'}), - 'db_is_active': ('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.TextField', [], {'blank': 'True'}), - 'db_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['objects.ObjectDB']", 'null': 'True', 'blank': 'True'}), - 'db_persistent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_repeats': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'db_start_delay': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'db_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['typeclasses.Tag']", 'null': 'True', 'symmetrical': 'False'}), - 'db_typeclass_path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['objects', 'scripts', 'comms', 'players', 'typeclasses'] - symmetrical = True diff --git a/src/typeclasses/migrations/0009_auto__del_unique_tag_db_key_db_category__add_unique_tag_db_key_db_cate.py b/src/typeclasses/migrations/0009_auto__del_unique_tag_db_key_db_category__add_unique_tag_db_key_db_cate.py deleted file mode 100644 index a3dc3557df..0000000000 --- a/src/typeclasses/migrations/0009_auto__del_unique_tag_db_key_db_category__add_unique_tag_db_key_db_cate.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -from south.utils import datetime_utils as datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - - -class Migration(SchemaMigration): - - def forwards(self, orm): - # Removing unique constraint on 'Tag', fields ['db_key', 'db_category'] - db.delete_unique(u'typeclasses_tag', ['db_key', 'db_category']) - - # Adding unique constraint on 'Tag', fields ['db_key', 'db_category', 'db_tagtype'] - db.create_unique(u'typeclasses_tag', ['db_key', 'db_category', 'db_tagtype']) - - # Removing index on 'Tag', fields ['db_key', 'db_category'] - db.delete_index(u'typeclasses_tag', ['db_key', 'db_category']) - - # Adding index on 'Tag', fields ['db_key', 'db_category', 'db_tagtype'] - db.create_index(u'typeclasses_tag', ['db_key', 'db_category', 'db_tagtype']) - - - def backwards(self, orm): - # Removing index on 'Tag', fields ['db_key', 'db_category', 'db_tagtype'] - db.delete_index(u'typeclasses_tag', ['db_key', 'db_category', 'db_tagtype']) - - # Adding index on 'Tag', fields ['db_key', 'db_category'] - db.create_index(u'typeclasses_tag', ['db_key', 'db_category']) - - # Removing unique constraint on 'Tag', fields ['db_key', 'db_category', 'db_tagtype'] - db.delete_unique(u'typeclasses_tag', ['db_key', 'db_category', 'db_tagtype']) - - # Adding unique constraint on 'Tag', fields ['db_key', 'db_category'] - db.create_unique(u'typeclasses_tag', ['db_key', 'db_category']) - - - models = { - u'typeclasses.attribute': { - 'Meta': {'object_name': 'Attribute'}, - 'db_attrtype': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '16', 'null': 'True', 'blank': 'True'}), - 'db_category': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}), - '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.TextField', [], {'blank': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), - 'db_strvalue': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_value': ('src.utils.picklefield.PickledObjectField', [], {'null': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - }, - u'typeclasses.tag': { - 'Meta': {'unique_together': "(('db_key', 'db_category', 'db_tagtype'),)", 'object_name': 'Tag', 'index_together': "(('db_key', 'db_category', 'db_tagtype'),)"}, - 'db_category': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'db_index': 'True'}), - 'db_data': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'db_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}), - 'db_model': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'db_index': 'True'}), - 'db_tagtype': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'db_index': 'True'}), - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) - } - } - - complete_apps = ['typeclasses'] \ No newline at end of file diff --git a/src/typeclasses/migrations/__init__.py b/src/typeclasses/migrations/__init__.py index e69de29bb2..40a96afc6f 100644 --- a/src/typeclasses/migrations/__init__.py +++ b/src/typeclasses/migrations/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*-