mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField
This commit is contained in:
committed by
Tim Graham
parent
87d55081ea
commit
c2e70f0265
@@ -17,15 +17,15 @@ def get_default_r():
|
||||
|
||||
|
||||
class S(models.Model):
|
||||
r = models.ForeignKey(R)
|
||||
r = models.ForeignKey(R, models.CASCADE)
|
||||
|
||||
|
||||
class T(models.Model):
|
||||
s = models.ForeignKey(S)
|
||||
s = models.ForeignKey(S, models.CASCADE)
|
||||
|
||||
|
||||
class U(models.Model):
|
||||
t = models.ForeignKey(T)
|
||||
t = models.ForeignKey(T, models.CASCADE)
|
||||
|
||||
|
||||
class RChild(R):
|
||||
@@ -35,33 +35,33 @@ class RChild(R):
|
||||
class A(models.Model):
|
||||
name = models.CharField(max_length=30)
|
||||
|
||||
auto = models.ForeignKey(R, related_name="auto_set")
|
||||
auto_nullable = models.ForeignKey(R, null=True,
|
||||
auto = models.ForeignKey(R, models.CASCADE, related_name="auto_set")
|
||||
auto_nullable = models.ForeignKey(R, models.CASCADE, null=True,
|
||||
related_name='auto_nullable_set')
|
||||
setvalue = models.ForeignKey(R, on_delete=models.SET(get_default_r),
|
||||
setvalue = models.ForeignKey(R, models.SET(get_default_r),
|
||||
related_name='setvalue')
|
||||
setnull = models.ForeignKey(R, on_delete=models.SET_NULL, null=True,
|
||||
setnull = models.ForeignKey(R, models.SET_NULL, null=True,
|
||||
related_name='setnull_set')
|
||||
setdefault = models.ForeignKey(R, on_delete=models.SET_DEFAULT,
|
||||
setdefault = models.ForeignKey(R, models.SET_DEFAULT,
|
||||
default=get_default_r, related_name='setdefault_set')
|
||||
setdefault_none = models.ForeignKey(R, on_delete=models.SET_DEFAULT,
|
||||
setdefault_none = models.ForeignKey(R, models.SET_DEFAULT,
|
||||
default=None, null=True, related_name='setnull_nullable_set')
|
||||
cascade = models.ForeignKey(R, on_delete=models.CASCADE,
|
||||
cascade = models.ForeignKey(R, models.CASCADE,
|
||||
related_name='cascade_set')
|
||||
cascade_nullable = models.ForeignKey(R, on_delete=models.CASCADE, null=True,
|
||||
cascade_nullable = models.ForeignKey(R, models.CASCADE, null=True,
|
||||
related_name='cascade_nullable_set')
|
||||
protect = models.ForeignKey(R, on_delete=models.PROTECT, null=True)
|
||||
donothing = models.ForeignKey(R, on_delete=models.DO_NOTHING, null=True,
|
||||
protect = models.ForeignKey(R, models.PROTECT, null=True)
|
||||
donothing = models.ForeignKey(R, models.DO_NOTHING, null=True,
|
||||
related_name='donothing_set')
|
||||
child = models.ForeignKey(RChild, related_name="child")
|
||||
child_setnull = models.ForeignKey(RChild, on_delete=models.SET_NULL, null=True,
|
||||
child = models.ForeignKey(RChild, models.CASCADE, related_name="child")
|
||||
child_setnull = models.ForeignKey(RChild, models.SET_NULL, null=True,
|
||||
related_name="child_setnull")
|
||||
|
||||
# A OneToOneField is just a ForeignKey unique=True, so we don't duplicate
|
||||
# all the tests; just one smoke test to ensure on_delete works for it as
|
||||
# well.
|
||||
o2o_setnull = models.ForeignKey(R, null=True,
|
||||
on_delete=models.SET_NULL, related_name="o2o_nullable_set")
|
||||
o2o_setnull = models.ForeignKey(R, models.SET_NULL, null=True,
|
||||
related_name="o2o_nullable_set")
|
||||
|
||||
|
||||
def create_a(name):
|
||||
@@ -86,13 +86,13 @@ class M(models.Model):
|
||||
|
||||
|
||||
class MR(models.Model):
|
||||
m = models.ForeignKey(M)
|
||||
r = models.ForeignKey(R)
|
||||
m = models.ForeignKey(M, models.CASCADE)
|
||||
r = models.ForeignKey(R, models.CASCADE)
|
||||
|
||||
|
||||
class MRNull(models.Model):
|
||||
m = models.ForeignKey(M)
|
||||
r = models.ForeignKey(R, null=True, on_delete=models.SET_NULL)
|
||||
m = models.ForeignKey(M, models.CASCADE)
|
||||
r = models.ForeignKey(R, models.SET_NULL, null=True)
|
||||
|
||||
|
||||
class Avatar(models.Model):
|
||||
@@ -100,15 +100,15 @@ class Avatar(models.Model):
|
||||
|
||||
|
||||
class User(models.Model):
|
||||
avatar = models.ForeignKey(Avatar, null=True)
|
||||
avatar = models.ForeignKey(Avatar, models.CASCADE, null=True)
|
||||
|
||||
|
||||
class HiddenUser(models.Model):
|
||||
r = models.ForeignKey(R, related_name="+")
|
||||
r = models.ForeignKey(R, models.CASCADE, related_name="+")
|
||||
|
||||
|
||||
class HiddenUserProfile(models.Model):
|
||||
user = models.ForeignKey(HiddenUser)
|
||||
user = models.ForeignKey(HiddenUser, models.CASCADE)
|
||||
|
||||
|
||||
class M2MTo(models.Model):
|
||||
@@ -132,4 +132,4 @@ class Base(models.Model):
|
||||
|
||||
|
||||
class RelToBase(models.Model):
|
||||
base = models.ForeignKey(Base, on_delete=models.DO_NOTHING)
|
||||
base = models.ForeignKey(Base, models.DO_NOTHING)
|
||||
|
||||
Reference in New Issue
Block a user