From 1cbf1b6ea902226cde3363f3eda53b7cee7fb278 Mon Sep 17 00:00:00 2001 From: Rob Knop Date: Thu, 18 Jul 2024 10:59:02 -0700 Subject: [PATCH] My hate for sqlalchemy knows no bounds --- models/base.py | 2 ++ tests/fixtures/ptf.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/models/base.py b/models/base.py index e3b4f490..b25ec9fe 100644 --- a/models/base.py +++ b/models/base.py @@ -1368,6 +1368,8 @@ def delete_from_disk_and_database( d.delete_from_disk_and_database( session=session, commit=commit, remove_folders=remove_folders, archive=archive, remove_downstreams=True ) + else: + raise RuntimeError( f"A {self.__class__} isn't able to remove a downstream {d.__class__}" ) if archive: diff --git a/tests/fixtures/ptf.py b/tests/fixtures/ptf.py index a8572398..d441d095 100644 --- a/tests/fixtures/ptf.py +++ b/tests/fixtures/ptf.py @@ -399,7 +399,7 @@ def ptf_aligned_images(request, ptf_cache_dir, data_dir, code_version): message=r'.*DELETE statement on table .* expected to delete \d* row\(s\).*', ) for image in ptf_reference_images: - image = safe_merge( session, image ) + # image = merge( session, image ) image.exposure.delete_from_disk_and_database(commit=False, session=session, remove_downstreams=True) # image.delete_from_disk_and_database(commit=False, session=session, remove_downstreams=True) session.commit()