Skip to content

Commit c62b400

Browse files
authored
Merge pull request #5024 from specify/issue-5021
Add DO_NOTHING for on_delete on TreeDefItems
2 parents 75762e8 + 3cb187c commit c62b400

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

specifyweb/specify/build_models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def pre_constraints_delete(self):
7373
# It will manually send the pre_delete signal for the django model object.
7474
# The pre_delete function must contain logic that will prevent ForeignKey constraints from being violated.
7575
# This is needed because database constraints are checked before pre_delete signals are sent.
76+
# This is not currently used, but is here for future use.
7677
pre_delete.send(sender=self.__class__, instance=self)
7778

7879
def save_timestamped(self, *args, **kwargs):
@@ -95,6 +96,7 @@ def save_timestamped(self, *args, **kwargs):
9596

9697
attrs['Meta'] = Meta
9798
if table.django_name in tables_with_pre_constraints_delete:
99+
# This is not currently used, but is here for future use.
98100
attrs['pre_constraints_delete'] = pre_constraints_delete
99101

100102
if has_timestamp_fields:

specifyweb/specify/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3641,7 +3641,7 @@ class Geographytreedefitem(model_extras.Geographytreedefitem):
36413641
# Relationships: Many-to-One
36423642
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
36433643
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
3644-
parent = models.ForeignKey('GeographyTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=protect_with_blockers)
3644+
parent = models.ForeignKey('GeographyTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
36453645
treedef = models.ForeignKey('GeographyTreeDef', db_column='GeographyTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)
36463646

36473647
class Meta:
@@ -3746,7 +3746,7 @@ class Geologictimeperiodtreedefitem(model_extras.Geologictimeperiodtreedefitem):
37463746
# Relationships: Many-to-One
37473747
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
37483748
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
3749-
parent = models.ForeignKey('GeologicTimePeriodTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=protect_with_blockers)
3749+
parent = models.ForeignKey('GeologicTimePeriodTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
37503750
treedef = models.ForeignKey('GeologicTimePeriodTreeDef', db_column='GeologicTimePeriodTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)
37513751

37523752
class Meta:
@@ -4235,7 +4235,7 @@ class Lithostrattreedefitem(model_extras.Lithostrattreedefitem):
42354235
# Relationships: Many-to-One
42364236
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
42374237
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
4238-
parent = models.ForeignKey('LithoStratTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=protect_with_blockers)
4238+
parent = models.ForeignKey('LithoStratTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
42394239
treedef = models.ForeignKey('LithoStratTreeDef', db_column='LithoStratTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)
42404240

42414241
class Meta:
@@ -6629,7 +6629,7 @@ class Storagetreedefitem(model_extras.Storagetreedefitem):
66296629
# Relationships: Many-to-One
66306630
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
66316631
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
6632-
parent = models.ForeignKey('StorageTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=protect_with_blockers)
6632+
parent = models.ForeignKey('StorageTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
66336633
treedef = models.ForeignKey('StorageTreeDef', db_column='StorageTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)
66346634

66356635
class Meta:
@@ -7057,7 +7057,7 @@ class Taxontreedefitem(model_extras.Taxontreedefitem):
70577057
# Relationships: Many-to-One
70587058
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
70597059
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
7060-
parent = models.ForeignKey('TaxonTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=protect_with_blockers)
7060+
parent = models.ForeignKey('TaxonTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
70617061
treedef = models.ForeignKey('TaxonTreeDef', db_column='TaxonTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)
70627062

70637063
class Meta:

0 commit comments

Comments
 (0)