From bf0591631d3dc6fcc9795d1d77ca82bad4b7b02f Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Wed, 1 Feb 2012 17:26:41 -0500 Subject: [PATCH] fix migration to reflect the right table name for registration --- courseware/migrations/0001_initial.py | 6 +++--- courseware/migrations/0002_add_indexes.py | 2 +- courseware/models.py | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/courseware/migrations/0001_initial.py b/courseware/migrations/0001_initial.py index 367c9f99cf..77e50322e0 100644 --- a/courseware/migrations/0001_initial.py +++ b/courseware/migrations/0001_initial.py @@ -37,7 +37,7 @@ class Migration(SchemaMigration): db.send_create_signal('courseware', ['UserProfile']) # Adding model 'Registration' - db.create_table('auth_userprofile', ( + db.create_table('auth_registration', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], unique=True)), ('activation_key', self.gf('django.db.models.fields.CharField')(unique=True, max_length=32, db_index=True)), @@ -57,7 +57,7 @@ class Migration(SchemaMigration): db.delete_table('auth_userprofile') # Deleting model 'Registration' - db.delete_table('auth_userprofile') + db.delete_table('auth_registration') models = { @@ -123,7 +123,7 @@ class Migration(SchemaMigration): 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, 'courseware.registration': { - 'Meta': {'object_name': 'Registration', 'db_table': "'auth_userprofile'"}, + 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"}, 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) diff --git a/courseware/migrations/0002_add_indexes.py b/courseware/migrations/0002_add_indexes.py index 116ccfcbb8..94fb6972c8 100644 --- a/courseware/migrations/0002_add_indexes.py +++ b/courseware/migrations/0002_add_indexes.py @@ -123,7 +123,7 @@ class Migration(SchemaMigration): 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) }, 'courseware.registration': { - 'Meta': {'object_name': 'Registration', 'db_table': "'auth_userprofile'"}, + 'Meta': {'object_name': 'Registration', 'db_table': "'auth_registration'"}, 'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32', 'db_index': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'}) diff --git a/courseware/models.py b/courseware/models.py index 7e762d89a7..c44b208fe3 100644 --- a/courseware/models.py +++ b/courseware/models.py @@ -1,3 +1,5 @@ +import uuid + from django.db import models from django.contrib.auth.models import User @@ -55,7 +57,7 @@ class Registration(models.Model): account, but that account is inactive. Once the user clicks on the activation key, it becomes active. ''' class Meta: - db_table = "auth_userprofile" + db_table = "auth_registration" user = models.ForeignKey(User, unique=True) activation_key = models.CharField(('activation key'), max_length=32, unique=True, db_index=True)