From 6a50db0e3d0de286b56e0ada1cc59ef295bf23b8 Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Sat, 5 Apr 2014 15:55:06 -0500 Subject: [PATCH] Markov: field changes: uniqueness, max_length --- ...002_unique_target_name_and_context_name.py | 60 +++++++++++++++++++ .../0003_markov_context_max_length_64.py | 44 ++++++++++++++ markov/models.py | 9 ++- 3 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 markov/migrations/0002_unique_target_name_and_context_name.py create mode 100644 markov/migrations/0003_markov_context_max_length_64.py diff --git a/markov/migrations/0002_unique_target_name_and_context_name.py b/markov/migrations/0002_unique_target_name_and_context_name.py new file mode 100644 index 0000000..23dffe9 --- /dev/null +++ b/markov/migrations/0002_unique_target_name_and_context_name.py @@ -0,0 +1,60 @@ +# -*- 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 field 'MarkovTarget.target' + db.delete_column(u'markov_markovtarget', 'target') + + # Adding field 'MarkovTarget.name' + db.add_column(u'markov_markovtarget', 'name', + self.gf('django.db.models.fields.CharField')(default='', unique=True, max_length=64), + keep_default=False) + + # Adding unique constraint on 'MarkovContext', fields ['name'] + db.create_unique(u'markov_markovcontext', ['name']) + + + def backwards(self, orm): + # Removing unique constraint on 'MarkovContext', fields ['name'] + db.delete_unique(u'markov_markovcontext', ['name']) + + # Adding field 'MarkovTarget.target' + db.add_column(u'markov_markovtarget', 'target', + self.gf('django.db.models.fields.CharField')(default='', max_length=64), + keep_default=False) + + # Deleting field 'MarkovTarget.name' + db.delete_column(u'markov_markovtarget', 'name') + + + models = { + u'markov.markovcontext': { + 'Meta': {'object_name': 'MarkovContext'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) + }, + u'markov.markovstate': { + 'Meta': {'unique_together': "(('context', 'k1', 'k2', 'v'),)", 'object_name': 'MarkovState'}, + 'context': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['markov.MarkovContext']"}), + 'count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'k1': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'k2': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'v': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + u'markov.markovtarget': { + 'Meta': {'object_name': 'MarkovTarget'}, + 'chatter_chance': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'context': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['markov.MarkovContext']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + } + } + + complete_apps = ['markov'] \ No newline at end of file diff --git a/markov/migrations/0003_markov_context_max_length_64.py b/markov/migrations/0003_markov_context_max_length_64.py new file mode 100644 index 0000000..31ec152 --- /dev/null +++ b/markov/migrations/0003_markov_context_max_length_64.py @@ -0,0 +1,44 @@ +# -*- 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 'MarkovContext.name' + db.alter_column(u'markov_markovcontext', 'name', self.gf('django.db.models.fields.CharField')(unique=True, max_length=64)) + + def backwards(self, orm): + + # Changing field 'MarkovContext.name' + db.alter_column(u'markov_markovcontext', 'name', self.gf('django.db.models.fields.CharField')(max_length=32, unique=True)) + + models = { + u'markov.markovcontext': { + 'Meta': {'object_name': 'MarkovContext'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + }, + u'markov.markovstate': { + 'Meta': {'unique_together': "(('context', 'k1', 'k2', 'v'),)", 'object_name': 'MarkovState'}, + 'context': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['markov.MarkovContext']"}), + 'count': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'k1': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'k2': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'v': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + u'markov.markovtarget': { + 'Meta': {'object_name': 'MarkovTarget'}, + 'chatter_chance': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'context': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['markov.MarkovContext']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64'}) + } + } + + complete_apps = ['markov'] \ No newline at end of file diff --git a/markov/models.py b/markov/models.py index 480d4e9..c86845c 100644 --- a/markov/models.py +++ b/markov/models.py @@ -15,7 +15,7 @@ class MarkovContext(models.Model): """Define contexts for Markov chains.""" - name = models.CharField(max_length=32) + name = models.CharField(max_length=64, unique=True) def __unicode__(self): """String representation.""" @@ -27,11 +27,16 @@ class MarkovTarget(models.Model): """Define IRC targets that relate to a context, and can occasionally be talked to.""" - target = models.CharField(max_length=64) + name = models.CharField(max_length=64, unique=True) context = models.ForeignKey(MarkovContext) chatter_chance = models.IntegerField(default=0) + def __unicode__(self): + """String representation.""" + + return u"{0:s}".format(self.name) + class MarkovState(models.Model):