fix: properly delete tables with filtered view

Signed-off-by: Cleopatra Enjeck M <patrathewhiz@gmail.com>
nextcloud · Feb 14, 2024 · d048383 · d048383
1 parent 2e10a44
commit d048383
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/lib/Service/TableService.php b/lib/Service/TableService.php
@@ -370,6 +370,16 @@ public function delete(int $id, ?string $userId = null): Table {
 			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
 		}
 
+		// delete all views for that table
+		// we must delete views before columns because we need columns
+		// while deleting views (in case we're deleting a table that has views)
+		try {
+			$this->viewService->deleteAllByTable($item, $userId);
+		} catch (InternalError|PermissionError $e) {
+			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
+		}
+
 		// delete all columns for that table
 		try {
 			$columns = $this->columnService->findAllByTable($id, null, $userId);
@@ -386,13 +396,6 @@ public function delete(int $id, ?string $userId = null): Table {
 			}
 		}
 
-		// delete all views for that table
-		try {
-			$this->viewService->deleteAllByTable($item, $userId);
-		} catch (InternalError|PermissionError $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-			throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
-		}
 
 		// delete all shares for that table
 		$this->shareService->deleteAllForTable($item);