Merge pull request #128 from treyhunner/fix-additional-migration

More fixes for `CustomForeignKey`

Author: macro1

runtests.py

@@ -21,6 +21,7 @@
     'simple_history',
     'simple_history.tests',
     'simple_history.tests.external',
+    'simple_history.tests.migration_test_app',
 ]
 
 DEFAULT_SETTINGS = dict(

simple_history/models.py

@@ -219,6 +219,11 @@ def get_history_user(self, instance):
 
 class CustomForeignKeyField(models.ForeignKey):
 
+    def __init__(self, *args, **kwargs):
+        super(CustomForeignKeyField, self).__init__(*args, **kwargs)
+        self.db_constraint = False
+        self.generate_reverse_relation = False
+
     def get_attname(self):
         return self.name
 

simple_history/tests/migration_test_app/__init__.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import simple_history.models
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='DoYouKnow',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='HistoricalYar',
+            fields=[
+                ('id', models.IntegerField(verbose_name='ID', auto_created=True, db_index=True, blank=True)),
+                ('history_id', models.AutoField(serialize=False, primary_key=True)),
+                ('history_date', models.DateTimeField()),
+                ('history_type', models.CharField(choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')], max_length=1)),
+                ('history_user', models.ForeignKey(null=True, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'historical yar',
+                'ordering': ('-history_date', '-history_id'),
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='WhatIMean',
+            fields=[
+                ('doyouknow_ptr', models.OneToOneField(primary_key=True, to='migration_test_app.DoYouKnow', auto_created=True, parent_link=True, serialize=False)),
+            ],
+            options={
+            },
+            bases=('migration_test_app.doyouknow',),
+        ),
+        migrations.CreateModel(
+            name='Yar',
+            fields=[
+                ('id', models.AutoField(serialize=False, verbose_name='ID', auto_created=True, primary_key=True)),
+                ('what', models.ForeignKey(to='migration_test_app.WhatIMean')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='historicalyar',
+            name='what_id',
+            field=simple_history.models.CustomForeignKeyField(to='migration_test_app.WhatIMean', blank=True, null=True, related_name='+'),
+            preserve_default=True,
+        ),
+    ]

simple_history/tests/migration_test_app/migrations/0001_initial.py

@@ -0,0 +1,15 @@
+from django.db import models
+from simple_history.models import HistoricalRecords
+
+
+class DoYouKnow(models.Model):
+    pass
+
+
+class WhatIMean(DoYouKnow):
+    pass
+
+
+class Yar(models.Model):
+    what = models.ForeignKey(WhatIMean)
+    history = HistoricalRecords()

simple_history/tests/migration_test_app/migrations/__init__.py

@@ -108,8 +108,13 @@ def test_no_historical(self):
                       out.getvalue())
 
 
+@skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
 class TestMigrate(TestCase):
 
-    @skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
+    def test_makemigration_command(self):
+        management.call_command(
+            'makemigrations', 'migration_test_app', stdout=StringIO())
+
     def test_migrate_command(self):
-        management.call_command('migrate', fake=True, stdout=StringIO())
+        management.call_command(
+            'migrate', 'migration_test_app', fake=True, stdout=StringIO())