Delete laboratory.workbooks reference on workbook container delete (#50)

labkey-jeckels · web-flow · commit 8473d7656676 · 2020-09-16T07:45:15.000-07:00
diff --git 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
         {

Original file line number	Diff line number	Diff line change
`@@ -122,11 +122,10 @@ protected void purgeTable(UserSchema userSchema, TableInfo table, Container c)`
`122`	`122`	`{`
`123`	`123`	`if (table.getName().equalsIgnoreCase(LaboratorySchema.TABLE_WORKBOOKS))`
`124`	`124`	`{`
`125`		`- if (!c.isWorkbook())`
`126`		`- {`
`127`		`- SQLFragment sql = new SQLFragment("DELETE FROM laboratory.workbooks WHERE " + LaboratoryWorkbooksTable.PARENT_COL + " = ?", c.getId());`
`128`		`- new SqlExecutor(table.getSchema()).execute(sql);`
`129`		`- }`
	`125`	`+ SQLFragment sql = new SQLFragment("DELETE FROM laboratory.workbooks WHERE " +`
	`126`	`+ (c.isWorkbook() ? LaboratoryWorkbooksTable.WORKBOOK_COL : LaboratoryWorkbooksTable.PARENT_COL) +`
	`127`	`+ " = ?", c.getId());`
	`128`	`+ new SqlExecutor(table.getSchema()).execute(sql);`
`130`	`129`	`}`
`131`	`130`	`else`
`132`	`131`	`{`