From 9a0268f7de5a77fea8dae69157ee087ecfb16d7a Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 24 Aug 2018 00:06:20 +0200 Subject: [PATCH] Fixed example app to run in Django 2.1 --- example/example/settings.py | 2 +- example/example/urls.py | 4 ++-- example/orders/migrations/0001_initial.py | 10 +++++----- example/orders/models.py | 2 +- example/pexp/migrations/0001_initial.py | 24 +++++++++++------------ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/example/example/settings.py b/example/example/settings.py index 1514227..58e4f35 100644 --- a/example/example/settings.py +++ b/example/example/settings.py @@ -41,7 +41,7 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ) -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', diff --git a/example/example/urls.py b/example/example/urls.py index 5a7d838..46bf8dc 100644 --- a/example/example/urls.py +++ b/example/example/urls.py @@ -1,11 +1,11 @@ from django.conf.urls import include, url from django.contrib import admin -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.views.generic import RedirectView admin.autodiscover() urlpatterns = [ - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'), permanent=False)), ] diff --git a/example/orders/migrations/0001_initial.py b/example/orders/migrations/0001_initial.py index f32d754..daf2861 100644 --- a/example/orders/migrations/0001_initial.py +++ b/example/orders/migrations/0001_initial.py @@ -38,7 +38,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='BankPayment', fields=[ - ('payment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orders.Payment')), + ('payment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='orders.Payment')), ('bank_name', models.CharField(max_length=100)), ('swift', models.CharField(max_length=20)), ], @@ -51,7 +51,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='CreditCardPayment', fields=[ - ('payment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orders.Payment')), + ('payment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='orders.Payment')), ('card_type', models.CharField(max_length=10)), ('expiry_month', models.PositiveSmallIntegerField(choices=[(1, 'jan'), (2, 'feb'), (3, 'mar'), (4, 'apr'), (5, 'may'), (6, 'jun'), (7, 'jul'), (8, 'aug'), (9, 'sep'), (10, 'oct'), (11, 'nov'), (12, 'dec')])), ('expiry_year', models.PositiveIntegerField()), @@ -65,7 +65,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='SepaPayment', fields=[ - ('payment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='orders.Payment')), + ('payment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='orders.Payment')), ('iban', models.CharField(max_length=34)), ('bic', models.CharField(max_length=11)), ], @@ -78,11 +78,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='payment', name='order', - field=models.ForeignKey(to='orders.Order'), + field=models.ForeignKey(to='orders.Order', on_delete=models.CASCADE), ), migrations.AddField( model_name='payment', name='polymorphic_ctype', - field=models.ForeignKey(related_name='polymorphic_orders.payment_set+', editable=False, to='contenttypes.ContentType', null=True), + field=models.ForeignKey(related_name='polymorphic_orders.payment_set+', editable=False, on_delete=models.CASCADE, to='contenttypes.ContentType', null=True), ), ] diff --git a/example/orders/models.py b/example/orders/models.py index 9691fae..8d2b682 100644 --- a/example/orders/models.py +++ b/example/orders/models.py @@ -27,7 +27,7 @@ class Payment(PolymorphicModel): """ A generic payment model. """ - order = models.ForeignKey(Order) + order = models.ForeignKey(Order, on_delete=models.CASCADE) currency = models.CharField(default='USD', max_length=3) amount = models.DecimalField(max_digits=10, decimal_places=2) diff --git a/example/pexp/migrations/0001_initial.py b/example/pexp/migrations/0001_initial.py index 6fc7616..8157638 100644 --- a/example/pexp/migrations/0001_initial.py +++ b/example/pexp/migrations/0001_initial.py @@ -35,7 +35,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('title', models.CharField(max_length=200)), - ('polymorphic_ctype', models.ForeignKey(related_name='polymorphic_pexp.proxybase_set+', editable=False, to='contenttypes.ContentType', null=True)), + ('polymorphic_ctype', models.ForeignKey(related_name='polymorphic_pexp.proxybase_set+', editable=False, on_delete=models.CASCADE, to='contenttypes.ContentType', null=True)), ], options={ 'ordering': ('title',), @@ -66,7 +66,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ArtProject', fields=[ - ('project_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.Project')), + ('project_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.Project')), ('artist', models.CharField(max_length=30)), ], options={ @@ -77,7 +77,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='NormalModelB', fields=[ - ('normalmodela_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.NormalModelA')), + ('normalmodela_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.NormalModelA')), ('field2', models.CharField(max_length=10)), ], bases=('pexp.normalmodela',), @@ -85,7 +85,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='ResearchProject', fields=[ - ('project_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.Project')), + ('project_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.Project')), ('supervisor', models.CharField(max_length=30)), ], options={ @@ -96,7 +96,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestModelB', fields=[ - ('testmodela_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.TestModelA')), + ('testmodela_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.TestModelA')), ('field2', models.CharField(max_length=10)), ], options={ @@ -107,7 +107,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='UUIDModelB', fields=[ - ('uuidmodela_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.UUIDModelA')), + ('uuidmodela_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.UUIDModelA')), ('field2', models.CharField(max_length=10)), ], options={ @@ -118,17 +118,17 @@ class Migration(migrations.Migration): migrations.AddField( model_name='uuidmodela', name='polymorphic_ctype', - field=models.ForeignKey(related_name='polymorphic_pexp.uuidmodela_set+', editable=False, to='contenttypes.ContentType', null=True), + field=models.ForeignKey(related_name='polymorphic_pexp.uuidmodela_set+', editable=False, on_delete=models.CASCADE, to='contenttypes.ContentType', null=True), ), migrations.AddField( model_name='testmodela', name='polymorphic_ctype', - field=models.ForeignKey(related_name='polymorphic_pexp.testmodela_set+', editable=False, to='contenttypes.ContentType', null=True), + field=models.ForeignKey(related_name='polymorphic_pexp.testmodela_set+', editable=False, on_delete=models.CASCADE, to='contenttypes.ContentType', null=True), ), migrations.AddField( model_name='project', name='polymorphic_ctype', - field=models.ForeignKey(related_name='polymorphic_pexp.project_set+', editable=False, to='contenttypes.ContentType', null=True), + field=models.ForeignKey(related_name='polymorphic_pexp.project_set+', editable=False, on_delete=models.CASCADE, to='contenttypes.ContentType', null=True), ), migrations.CreateModel( name='ProxyA', @@ -151,7 +151,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='NormalModelC', fields=[ - ('normalmodelb_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.NormalModelB')), + ('normalmodelb_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.NormalModelB')), ('field3', models.CharField(max_length=10)), ], bases=('pexp.normalmodelb',), @@ -159,7 +159,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='TestModelC', fields=[ - ('testmodelb_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.TestModelB')), + ('testmodelb_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.TestModelB')), ('field3', models.CharField(max_length=10)), ('field4', models.ManyToManyField(related_name='related_c', to='pexp.TestModelB')), ], @@ -171,7 +171,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='UUIDModelC', fields=[ - ('uuidmodelb_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pexp.UUIDModelB')), + ('uuidmodelb_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, on_delete=models.CASCADE, to='pexp.UUIDModelB')), ('field3', models.CharField(max_length=10)), ], options={