From b6a4997a974872cef0b9a58de6cebe4b5ce6716c Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 26 Jan 2017 09:22:47 +0100 Subject: [PATCH] Update previous migration, updating the uniqueness parameters. To re-run the previous migration, first do evennia migrate --fake 0006, then run evennia migrate again. --- .../migrations/0007_tag_migrations_may_be_slow.py | 12 +++++++++++- evennia/typeclasses/tags.py | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py index 13c582fbda..5d47e5f481 100644 --- a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py +++ b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py @@ -70,5 +70,15 @@ class Migration(migrations.Migration): ] operations = [ - migrations.RunPython(update_tags_with_dbmodel) + + migrations.AlterUniqueTogether( + name='tag', + unique_together=set([('db_key', 'db_category', 'db_tagtype', 'db_model')]), + ), + migrations.AlterIndexTogether( + name='tag', + index_together=set([('db_key', 'db_category', 'db_tagtype', 'db_model')]), + ), + + migrations.RunPython(update_tags_with_dbmodel) ] diff --git a/evennia/typeclasses/tags.py b/evennia/typeclasses/tags.py index 670a245cfc..a88e68e305 100644 --- a/evennia/typeclasses/tags.py +++ b/evennia/typeclasses/tags.py @@ -61,8 +61,8 @@ class Tag(models.Model): class Meta(object): "Define Django meta options" verbose_name = "Tag" - unique_together = (('db_key', 'db_category', 'db_tagtype'),) - index_together = (('db_key', 'db_category', 'db_tagtype'),) + unique_together = (('db_key', 'db_category', 'db_tagtype', 'db_model'),) + index_together = (('db_key', 'db_category', 'db_tagtype', 'db_model'),) def __unicode__(self): return u"" % (self.db_key, "(category:%s)" % self.db_category if self.db_category else "")