Make migrations work with custom user model

django-oscar · Aug 13, 2013 · 590333f · 590333f
1 parent 0bc73dd
commit 590333f
Show file tree

Hide file tree

Showing 42 changed files with 255 additions and 205 deletions.
diff --git a/oscar/apps/address/migrations/0001_initial.py b/oscar/apps/address/migrations/0001_initial.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 class Migration(SchemaMigration):
 
@@ -24,7 +25,7 @@ def forwards(self, orm):
             ('search_text', self.gf('django.db.models.fields.CharField')(max_length=1000)),
             ('phone_number', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
             ('notes', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='addresses', to=orm['auth.User'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='addresses', to=orm[AUTH_USER_MODEL])),
             ('is_default_for_shipping', self.gf('django.db.models.fields.BooleanField')(default=False)),
             ('is_default_for_billing', self.gf('django.db.models.fields.BooleanField')(default=False)),
             ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
@@ -87,7 +88,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -102,8 +103,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),

diff --git a/oscar/apps/address/migrations/0002_auto__chg_field_useraddress_postcode.py b/oscar/apps/address/migrations/0002_auto__chg_field_useraddress_postcode.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 
 class Migration(SchemaMigration):
@@ -49,7 +50,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),
@@ -89,4 +90,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['address']
+    complete_apps = ['address']
diff --git a/oscar/apps/address/migrations/0003_auto__add_field_country_display_order.py b/oscar/apps/address/migrations/0003_auto__add_field_country_display_order.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 
 class Migration(SchemaMigration):
@@ -52,7 +53,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -67,8 +68,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),
@@ -92,4 +93,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['address']
+    complete_apps = ['address']
diff --git a/oscar/apps/address/migrations/0004_convert_is_highlighted.py b/oscar/apps/address/migrations/0004_convert_is_highlighted.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 class Migration(DataMigration):
 
@@ -49,7 +50,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),

diff --git a/oscar/apps/address/migrations/0005_auto__del_field_country_is_highlighted.py b/oscar/apps/address/migrations/0005_auto__del_field_country_is_highlighted.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 
 class Migration(SchemaMigration):
@@ -51,7 +52,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -66,8 +67,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),
@@ -91,4 +92,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['address']
+    complete_apps = ['address']
diff --git a/oscar/apps/address/migrations/0006_auto__add_unique_useraddress_hash_user.py b/oscar/apps/address/migrations/0006_auto__add_unique_useraddress_hash_user.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 
 class Migration(SchemaMigration):
@@ -49,7 +50,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),
@@ -89,4 +90,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['address']
+    complete_apps = ['address']
diff --git a/oscar/apps/address/migrations/0007_auto__chg_field_useraddress_postcode.py b/oscar/apps/address/migrations/0007_auto__chg_field_useraddress_postcode.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 
 class Migration(SchemaMigration):
@@ -49,7 +50,7 @@ def backwards(self, orm):
             'search_text': ('django.db.models.fields.CharField', [], {'max_length': '1000'}),
             'state': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': u"orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': u"orm['{0}']".format(AUTH_USER_MODEL)})
         },
         u'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -64,8 +65,8 @@ def backwards(self, orm):
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),
@@ -89,4 +90,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['address']
+    complete_apps = ['address']
diff --git a/oscar/apps/analytics/migrations/0001_initial.py b/oscar/apps/analytics/migrations/0001_initial.py
@@ -3,6 +3,7 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
+from oscar.core.compat import AUTH_USER_MODEL, AUTH_USER_MODEL_NAME
 
 class Migration(SchemaMigration):
     depends_on = (
@@ -26,7 +27,7 @@ def forwards(self, orm):
         # Adding model 'UserRecord'
         db.create_table('analytics_userrecord', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
+            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[AUTH_USER_MODEL], unique=True)),
             ('num_product_views', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
             ('num_basket_additions', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
             ('num_orders', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, db_index=True)),
@@ -40,7 +41,7 @@ def forwards(self, orm):
         # Adding model 'UserProductView'
         db.create_table('analytics_userproductview', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
             ('product', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['catalogue.Product'])),
             ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
         ))
@@ -49,7 +50,7 @@ def forwards(self, orm):
         # Adding model 'UserSearch'
         db.create_table('analytics_usersearch', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[AUTH_USER_MODEL])),
             ('query', self.gf('django.db.models.fields.CharField')(max_length=255, db_index=True)),
             ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
         ))
@@ -86,7 +87,7 @@ def backwards(self, orm):
             'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'product': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['catalogue.Product']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'analytics.userrecord': {
             'Meta': {'object_name': 'UserRecord'},
@@ -98,14 +99,14 @@ def backwards(self, orm):
             'num_orders': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'db_index': 'True'}),
             'num_product_views': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
             'total_spent': ('django.db.models.fields.DecimalField', [], {'default': "'0.00'", 'max_digits': '12', 'decimal_places': '2'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'})
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL), 'unique': 'True'})
         },
         'analytics.usersearch': {
             'Meta': {'object_name': 'UserSearch'},
             'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'query': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['{0}']".format(AUTH_USER_MODEL)})
         },
         'auth.group': {
             'Meta': {'object_name': 'Group'},
@@ -120,8 +121,8 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
+        AUTH_USER_MODEL: {
+            'Meta': {'object_name': AUTH_USER_MODEL_NAME},
             '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'}),