From afa63577b7bc660316fbd1c04891348a2b35afa1 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Tue, 15 Sep 2020 17:34:56 -0700 Subject: [PATCH] Delete laboratory.workbooks reference on workbook container delete --- .../labkey/laboratory/LaboratoryContainerListener.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryContainerListener.java b/laboratory/src/org/labkey/laboratory/LaboratoryContainerListener.java index 3d4a59eb..b1b8b634 100644 --- a/laboratory/src/org/labkey/laboratory/LaboratoryContainerListener.java +++ b/laboratory/src/org/labkey/laboratory/LaboratoryContainerListener.java @@ -122,11 +122,10 @@ protected void purgeTable(UserSchema userSchema, TableInfo table, Container c) { if (table.getName().equalsIgnoreCase(LaboratorySchema.TABLE_WORKBOOKS)) { - if (!c.isWorkbook()) - { - SQLFragment sql = new SQLFragment("DELETE FROM laboratory.workbooks WHERE " + LaboratoryWorkbooksTable.PARENT_COL + " = ?", c.getId()); - new SqlExecutor(table.getSchema()).execute(sql); - } + SQLFragment sql = new SQLFragment("DELETE FROM laboratory.workbooks WHERE " + + (c.isWorkbook() ? LaboratoryWorkbooksTable.WORKBOOK_COL : LaboratoryWorkbooksTable.PARENT_COL) + + " = ?", c.getId()); + new SqlExecutor(table.getSchema()).execute(sql); } else {