From 6f842a109284899b8a17258bf36840465c27a417 Mon Sep 17 00:00:00 2001
From: Stephan Porada <sporada@uni-bielefeld.de>
Date: Mon, 18 May 2020 14:53:31 +0200
Subject: [PATCH] Remove unnecessary deletes which hare handled by cascade
options
---
app/models.py | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/app/models.py b/app/models.py
index 810518d7..43f9e90d 100644
--- a/app/models.py
+++ b/app/models.py
@@ -241,10 +241,7 @@ class User(UserMixin, db.Model):
'''
Delete the user and its corpora and jobs from database and filesystem.
'''
- for job in self.jobs:
- job.delete()
- for corpus in self.corpora:
- corpus.delete()
+
db.session.delete(self)
db.session.commit()
@@ -365,10 +362,7 @@ class Job(db.Model):
'''
Delete the job and its inputs and results from the database.
'''
- for input in self.inputs:
- db.session.delete(input)
- for result in self.results:
- db.session.delete(result) # TODO: shouldn't this happen through the cascade option?
+
db.session.delete(self)
db.session.commit()
@@ -528,8 +522,6 @@ class Corpus(db.Model):
'files': {file.id: file.to_dict() for file in self.files}}
def delete(self):
- for corpus_file in self.files:
- db.session.delete(corpus_file)
db.session.delete(self)
db.session.commit()
--
GitLab