diff --git a/chat/models.py b/chat/models.py index 8fec61a..67e2fcf 100644 --- a/chat/models.py +++ b/chat/models.py @@ -1,6 +1,7 @@ """Chat related models""" from __future__ import unicode_literals +import django import django.utils.timezone from django.db import models from django.db.models.signals import post_save @@ -29,7 +30,10 @@ class Room(models.Model): class Meta(object): verbose_name = _('Room') verbose_name_plural = _('Rooms') - index_together = ['name'] + if django.VERSION[:2] > (1, 4): + index_together = [ + ['name'], + ] def __str__(self): return self.name diff --git a/chat/south_migrations/0001_initial.py b/chat/south_migrations/0001_initial.py new file mode 100644 index 0000000..066d4bf --- /dev/null +++ b/chat/south_migrations/0001_initial.py @@ -0,0 +1,125 @@ +# -*- 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 model 'Room' + db.create_table('chat_room', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('created_at', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), + ('created_by', self.gf('django.db.models.fields.related.ForeignKey')(related_name=u'my_chat_rooms', blank=True, db_column=u'created_by', to=orm['auth.User'])), + )) + db.send_create_signal('chat', ['Room']) + + # Adding M2M table for field users on 'Room' + m2m_table_name = db.shorten_name('chat_room_users') + db.create_table(m2m_table_name, ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('room', models.ForeignKey(orm['chat.room'], null=False)), + ('user', models.ForeignKey(orm['auth.user'], null=False)) + )) + db.create_unique(m2m_table_name, ['room_id', 'user_id']) + + # Adding model 'Message' + db.create_table('chat_message', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('room', self.gf('django.db.models.fields.related.ForeignKey')(related_name=u'messages', to=orm['chat.Room'])), + ('sender', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('message', self.gf('django.db.models.fields.TextField')()), + ('created_at', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), + )) + db.send_create_signal('chat', ['Message']) + + # Adding model 'MessageDelivery' + db.create_table('chat_messagedelivery', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('message', self.gf('django.db.models.fields.related.ForeignKey')(related_name=u'deliveries', to=orm['chat.Message'])), + ('receiver', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), + ('delivered_at', self.gf('django.db.models.fields.DateTimeField')(null=True, blank=True)), + )) + db.send_create_signal('chat', ['MessageDelivery']) + + + def backwards(self, orm): + # Deleting model 'Room' + db.delete_table('chat_room') + + # Removing M2M table for field users on 'Room' + db.delete_table(db.shorten_name('chat_room_users')) + + # Deleting model 'Message' + db.delete_table('chat_message') + + # Deleting model 'MessageDelivery' + db.delete_table('chat_messagedelivery') + + + 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'}) + }, + 'chat.message': { + 'Meta': {'object_name': 'Message'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'message': ('django.db.models.fields.TextField', [], {}), + 'room': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'messages'", 'to': "orm['chat.Room']"}), + 'sender': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'chat.messagedelivery': { + 'Meta': {'object_name': 'MessageDelivery'}, + 'delivered_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'deliveries'", 'to': "orm['chat.Message']"}), + 'receiver': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'chat.room': { + 'Meta': {'object_name': 'Room'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "u'my_chat_rooms'", 'blank': 'True', 'db_column': "u'created_by'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "u'chat_rooms'", 'symmetrical': 'False', 'to': "orm['auth.User']"}) + }, + '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'}) + } + } + + complete_apps = ['chat'] \ No newline at end of file diff --git a/chat/south_migrations/__init__.py b/chat/south_migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/fixtures/undelivered.yaml b/tests/fixtures/undelivered.yaml index b994efd..49be326 100644 --- a/tests/fixtures/undelivered.yaml +++ b/tests/fixtures/undelivered.yaml @@ -32,17 +32,20 @@ created_by: 3 users: [3, 4, 5] -- model: 'chat.Message' +- pk: 1 + model: 'chat.Message' fields: room: 1 sender: 1 message: 'message 1' -- model: 'chat.Message' +- pk: 2 + model: 'chat.Message' fields: room: 1 sender: 2 message: 'message 2' -- model: 'chat.Message' +- pk: 3 + model: 'chat.Message' fields: room: 2 sender: 3