Commit 4f2eb5fc authored by Luis San Pablo's avatar Luis San Pablo Committed by Tim Graham
Browse files

[1.9.x] Fixed #25981 -- Added need to update migrations to on_delete deprecation warning. 

Backport of a856555d from master
parent bc5eed8f

django/db/models/fields/related.py

+6 −4
Original line number Diff line number Diff line
@@ -759,8 +759,9 @@ class ForeignKey(ForeignObject): 


        if on_delete is None:

            warnings.warn(

                "on_delete will be a required arg for %s in Django 2.0. "

                "Set it to models.CASCADE if you want to maintain the current default behavior. "

                "on_delete will be a required arg for %s in Django 2.0. Set "

                "it to models.CASCADE on models and in existing migrations "

                "if you want to maintain the current default behavior. "

                "See https://docs.djangoproject.com/en/%s/ref/models/fields/"

                "#django.db.models.ForeignKey.on_delete" % (

                    self.__class__.__name__,
@@ -1001,8 +1002,9 @@ class OneToOneField(ForeignKey): 


        if on_delete is None:

            warnings.warn(

                "on_delete will be a required arg for %s in Django 2.0. "

                "Set it to models.CASCADE if you want to maintain the current default behavior. "

                "on_delete will be a required arg for %s in Django 2.0. Set "

                "it to models.CASCADE on models and in existing migrations "

                "if you want to maintain the current default behavior. "

                "See https://docs.djangoproject.com/en/%s/ref/models/fields/"

                "#django.db.models.ForeignKey.on_delete" % (

                    self.__class__.__name__,

tests/invalid_models_tests/test_relative_fields.py

+6 −6
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ class RelativeFieldTests(IsolatedModelsTestCase): 
            self.assertEqual(

                str(warns[0].message),

                'on_delete will be a required arg for ForeignKey in Django '

                '2.0. Set it to models.CASCADE if you want to maintain the '

                'current default behavior. See '

                'https://docs.djangoproject.com/en/%s/ref/models/fields/'

                '2.0. Set it to models.CASCADE on models and in existing '

                'migrations if you want to maintain the current default '

                'behavior. See https://docs.djangoproject.com/en/%s/ref/models/fields/'

                '#django.db.models.ForeignKey.on_delete' % get_docs_version(),

            )
@@ -90,9 +90,9 @@ class RelativeFieldTests(IsolatedModelsTestCase): 
            self.assertEqual(

                str(warns[0].message),

                'on_delete will be a required arg for OneToOneField in Django '

                '2.0. Set it to models.CASCADE if you want to maintain the '

                'current default behavior. See '

                'https://docs.djangoproject.com/en/%s/ref/models/fields/'

                '2.0. Set it to models.CASCADE on models and in existing '

                'migrations if you want to maintain the current default '

                'behavior. See https://docs.djangoproject.com/en/%s/ref/models/fields/'

                '#django.db.models.ForeignKey.on_delete' % get_docs_version(),

            )