Merge pull request #8206 from Oldiesmann/fix_postgres_search

Author: Sesquipedalian

Sources/Search/APIs/Custom.php

@@ -213,11 +213,10 @@ public function getSize(): int
 			if ($request !== false && Db::$db->num_rows($request) == 1) {
 				$row = Db::$db->fetch_assoc($request);
 				$this->size = (int) $row['Data_length'] + (int) $row['Index_length'];
+				Db::$db->free_result($request);
 			}
 		}
 
-		Db::$db->free_result($request);
-
 		return $this->size;
 	}
 

Sources/Search/APIs/Parsed.php

@@ -188,6 +188,14 @@ public function getSize(): int
 		$this->size = 0;
 
 		if (Db::$db->title === POSTGRE_TITLE) {
+
+			// Postgres will throw an error if the tables don't exist, so check first
+			$search_tables = Db::$db->list_tables(Db::$db->name, Db::$db->prefix . 'log_search%');
+
+			if (array_intersect([Db::$db->prefix . 'log_search_dictionary', Db::$db->prefix . 'log_search_parsed'], $search_tables) == []) {
+				return $this->size;
+			}
+
 			$request = Db::$db->query(
 				'',
 				'SELECT (
@@ -203,6 +211,8 @@ public function getSize(): int
 			while ($row = Db::$db->fetch_assoc($request)) {
 				$this->size = (int) $row['total_size'];
 			}
+
+			Db::$db->free_result($request);
 		} else {
 			$request = Db::$db->query(
 				'',