Skip to content

Add DO_NOTHING for on_delete on TreeDefItems #5024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 20, 2024
Merged

Add DO_NOTHING for on_delete on TreeDefItems #5024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
450b8cf
add DELETE_BLOCKER_EXCEPTIONS filter
acwhite211 Jun 20, 2024
e3a24d1
use filter function
acwhite211 Jun 20, 2024
caca26e
add comment
acwhite211 Jun 20, 2024
ce3ee48
add models.DO_NOTHING to TreeDefItems
acwhite211 Jun 20, 2024
0a21c3f
remove DELETE_BLOCKER_EXCEPTIONS
acwhite211 Jun 20, 2024
651c4f5
format
acwhite211 Jun 20, 2024
3cb187c
pre_constraints_delete comment
acwhite211 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions specifyweb/specify/build_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def pre_constraints_delete(self):
# It will manually send the pre_delete signal for the django model object.
# The pre_delete function must contain logic that will prevent ForeignKey constraints from being violated.
# This is needed because database constraints are checked before pre_delete signals are sent.
# This is not currently used, but is here for future use.
pre_delete.send(sender=self.__class__, instance=self)

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

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

if has_timestamp_fields:
Expand Down
10 changes: 5 additions & 5 deletions specifyweb/specify/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3641,7 +3641,7 @@ class Geographytreedefitem(model_extras.Geographytreedefitem):
# Relationships: Many-to-One
createdbyagent = models.ForeignKey('Agent', db_column='CreatedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
modifiedbyagent = models.ForeignKey('Agent', db_column='ModifiedByAgentID', related_name='+', null=True, on_delete=protect_with_blockers)
parent = models.ForeignKey('GeographyTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=protect_with_blockers)
parent = models.ForeignKey('GeographyTreeDefItem', db_column='ParentItemID', related_name='children', null=True, on_delete=models.DO_NOTHING)
treedef = models.ForeignKey('GeographyTreeDef', db_column='GeographyTreeDefID', related_name='treedefitems', null=False, on_delete=protect_with_blockers)

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

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

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

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

class Meta:
Expand Down