diff --git a/eve_api/migrations/0006_auto__chg_field_eveplayercharacter_id__chg_field_eveplayercorporation_.py b/eve_api/migrations/0006_auto__chg_field_eveplayercharacter_id__chg_field_eveplayercorporation_.py deleted file mode 100644 index 2f7a33c..0000000 --- a/eve_api/migrations/0006_auto__chg_field_eveplayercharacter_id__chg_field_eveplayercorporation_.py +++ /dev/null @@ -1,164 +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 'EVEPlayerCharacter.id' - db.alter_column('eve_api_eveplayercharacter', 'id', self.gf('django.db.models.fields.BigIntegerField')(primary_key=True)) - - # Changing field 'EVEPlayerCorporation.id' - db.alter_column('eve_api_eveplayercorporation', 'id', self.gf('django.db.models.fields.BigIntegerField')(primary_key=True)) - - # Changing field 'EVEPlayerCharacterRole.id' - db.alter_column('eve_api_eveplayercharacterrole', 'id', self.gf('django.db.models.fields.BigIntegerField')(primary_key=True)) - - # Changing field 'EVEAccount.api_user_id' - db.alter_column('eve_api_eveaccount', 'api_user_id', self.gf('django.db.models.fields.BigIntegerField')()) - - # Changing field 'EVEAccount.id' - db.alter_column('eve_api_eveaccount', 'id', self.gf('django.db.models.fields.BigIntegerField')(primary_key=True)) - - # Changing field 'EVEPlayerAlliance.id' - db.alter_column('eve_api_eveplayeralliance', 'id', self.gf('django.db.models.fields.BigIntegerField')(primary_key=True)) - - - def backwards(self, orm): - - # Changing field 'EVEPlayerCharacter.id' - db.alter_column('eve_api_eveplayercharacter', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)) - - # Changing field 'EVEPlayerCorporation.id' - db.alter_column('eve_api_eveplayercorporation', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)) - - # Changing field 'EVEPlayerCharacterRole.id' - db.alter_column('eve_api_eveplayercharacterrole', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)) - - # Changing field 'EVEAccount.api_user_id' - db.alter_column('eve_api_eveaccount', 'api_user_id', self.gf('django.db.models.fields.IntegerField')()) - - # Changing field 'EVEAccount.id' - db.alter_column('eve_api_eveaccount', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)) - - # Changing field 'EVEPlayerAlliance.id' - db.alter_column('eve_api_eveplayeralliance', 'id', self.gf('django.db.models.fields.AutoField')(primary_key=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': {'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', 'blank': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), - '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': {'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'}) - }, - 'eve_api.eveaccount': { - 'Meta': {'object_name': 'EVEAccount'}, - 'api_key': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'api_keytype': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'api_status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), - 'api_user_id': ('django.db.models.fields.BigIntegerField', [], {}), - 'characters': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['eve_api.EVEPlayerCharacter']", 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}), - 'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}) - }, - 'eve_api.eveplayeralliance': { - 'Meta': {'object_name': 'EVEPlayerAlliance'}, - 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'date_founded': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}), - 'member_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'ticker': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'}) - }, - 'eve_api.eveplayercharacter': { - 'Meta': {'object_name': 'EVEPlayerCharacter'}, - 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'attrib_charisma': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'attrib_intelligence': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'attrib_memory': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'attrib_perception': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'attrib_willpower': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'balance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), - 'corporation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCorporation']", 'null': 'True', 'blank': 'True'}), - 'current_location_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'director': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), - 'gender': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'last_logoff': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), - 'race': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'roles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['eve_api.EVEPlayerCharacterRole']", 'null': 'True', 'blank': 'True'}), - 'total_sp': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) - }, - 'eve_api.eveplayercharacterrole': { - 'Meta': {'object_name': 'EVEPlayerCharacterRole'}, - 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'roleid': ('django.db.models.fields.CharField', [], {'max_length': '64'}) - }, - 'eve_api.eveplayercorporation': { - 'Meta': {'object_name': 'EVEPlayerCorporation'}, - 'alliance': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerAlliance']", 'null': 'True', 'blank': 'True'}), - 'alliance_join_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), - 'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), - 'applications': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), - 'ceo_character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']", 'null': 'True', 'blank': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), - 'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), - 'id': ('django.db.models.fields.BigIntegerField', [], {'primary_key': 'True'}), - 'logo_color1': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'logo_color2': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'logo_color3': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'logo_graphic_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'logo_shape1': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'logo_shape2': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'logo_shape3': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'member_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), - 'shares': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), - 'tax_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), - 'ticker': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), - 'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) - } - } - - complete_apps = ['eve_api'] diff --git a/eve_api/models/api_player.py b/eve_api/models/api_player.py index 457e913..1b69b04 100644 --- a/eve_api/models/api_player.py +++ b/eve_api/models/api_player.py @@ -14,7 +14,6 @@ class EVEAPIModel(models.Model): A simple abstract base class to set some consistent fields on the models that are updated from the EVE API. """ - id = models.BigIntegerField(primary_key=True) api_last_updated = models.DateTimeField(blank=True, null=True, verbose_name="Time last updated from API", help_text="When this object was last updated from the EVE API.") @@ -32,7 +31,7 @@ class EVEAccount(EVEAPIModel): description = models.CharField(max_length=50, blank=True, help_text="User-provided description.") api_key = models.CharField(max_length=64, verbose_name="API Key") - api_user_id = models.BigIntegerField(verbose_name="API User ID") + api_user_id = models.IntegerField(verbose_name="API User ID") characters = models.ManyToManyField("EVEPlayerCharacter", blank=True, null=True) api_status = models.IntegerField(choices=API_STATUS_CHOICES,