Merge pull request #21 from Wikia/PLATFORM-9121

PLATFORM-9121 | Do not swallow DB errors in Cargo query
Wikia · Mar 6, 2024 · 39eca5c · 39eca5c
2 parents 952a358 + 3e29ed7
commit 39eca5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/includes/CargoLuaLibrary.php b/includes/CargoLuaLibrary.php
@@ -48,6 +48,8 @@ public function cargoQuery( $tables, $fields, $args ): array {
 			$query = CargoSQLQuery::newFromValues( $tables, $fields, $where, $join,
 				$groupBy, $having, $orderBy, $limit, $offset );
 			$rows = $query->run();
+		} catch ( \Wikimedia\Rdbms\DBError $e ) {
+			throw $e;
 		} catch ( Exception $e ) {
 			// Allow for error handling within Lua.
 			throw new Scribunto_LuaError( $e->getMessage() );

diff --git a/includes/parserfunctions/CargoQuery.php b/includes/parserfunctions/CargoQuery.php
@@ -114,6 +114,8 @@ public static function run( $parser ) {
 				);
 				$queryResultsJustForResultsTitle = $sqlQueryJustForResultsTitle->run();
 			}
+		} catch ( \Wikimedia\Rdbms\DBError $e ) {
+			throw $e;
 		} catch ( Exception $e ) {
 			return CargoUtils::formatError( $e->getMessage() );
 		}