Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22620 from edx/on_delete_parameter

Browse Source 
Added on_delete parameter to models
This commit is contained in:
Aarif
2019-12-31 15:23:47 +05:00
committed by GitHub
parent 80fb484a98 02350e0fee
commit e607657a73
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/grades/migrations/0013_persistentsubsectiongradeoverride.py
View File

@@ -21,7 +21,8 @@ class Migration(migrations.Migration):
('possible_all_override', models.FloatField(null=True, blank=True)),
('earned_graded_override', models.FloatField(null=True, blank=True)),
('possible_graded_override', models.FloatField(null=True, blank=True)),
('grade', models.OneToOneField(related_name='override', to='grades.PersistentSubsectionGrade')),
('grade', models.OneToOneField(related_name='override', to='grades.PersistentSubsectionGrade',
on_delete=models.CASCADE)),
],
),
]

4
lms/djangoapps/grades/models.py
View File

@@ -654,7 +654,7 @@ class PersistentSubsectionGradeOverride(models.Model):
class Meta(object):
app_label = "grades"
grade = models.OneToOneField(PersistentSubsectionGrade, related_name='override')
grade = models.OneToOneField(PersistentSubsectionGrade, related_name='override', on_delete=models.CASCADE)
# Created/modified timestamps prevent race-conditions when using with async rescoring tasks
created = models.DateTimeField(auto_now_add=True, db_index=True)
@@ -805,7 +805,7 @@ class PersistentSubsectionGradeOverrideHistory(models.Model):
choices=OVERRIDE_ACTIONS,
default=CREATE_OR_UPDATE
)
user = models.ForeignKey(User, blank=True, null=True)
user = models.ForeignKey(User, blank=True, null=True, on_delete=models.CASCADE)
comments = models.CharField(max_length=300, blank=True, null=True)
created = models.DateTimeField(auto_now_add=True, db_index=True)

2
lms/djangoapps/program_enrollments/models.py
View File

@@ -40,7 +40,7 @@ class ProgramEnrollment(TimeStampedModel): # pylint: disable=model-missing-unic
user = models.ForeignKey(
User,
null=True,
blank=True
blank=True, on_delete=models.CASCADE
)
external_user_key = models.CharField(
db_index=True,

8
openedx/core/djangoapps/oauth_dispatch/models.py
View File

@@ -68,7 +68,8 @@ class ApplicationAccess(models.Model):
.. no_pii:
"""
application = models.OneToOneField(oauth2_settings.APPLICATION_MODEL, related_name='access')
application = models.OneToOneField(oauth2_settings.APPLICATION_MODEL, related_name='access',
on_delete=models.CASCADE)
scopes = ListCharField(
base_field=models.CharField(max_length=32),
size=25,
@@ -108,8 +109,9 @@ class ApplicationOrganization(models.Model):
(RELATION_TYPE_CONTENT_ORG, _('Content Provider')),
)
application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL, related_name='organizations')
organization = models.ForeignKey(Organization)
application = models.ForeignKey(oauth2_settings.APPLICATION_MODEL, related_name='organizations',
on_delete=models.CASCADE)
organization = models.ForeignKey(Organization, on_delete=models.CASCADE)
relation_type = models.CharField(
max_length=32,
choices=RELATION_TYPES,

2
openedx/core/djangoapps/user_api/models.py
View File

@@ -204,7 +204,7 @@ class UserRetirementPartnerReportingStatus(TimeStampedModel):
.. pii_types: name, username, email_address
.. pii_retirement: local_api
"""
user = models.OneToOneField(User)
user = models.OneToOneField(User, on_delete=models.CASCADE)
original_username = models.CharField(max_length=150, db_index=True)
original_email = models.EmailField(db_index=True)
original_name = models.CharField(max_length=255, blank=True, db_index=True)