Only set sqlQuery if used for debug (#142)

Universal-Omega · Mar 20, 2022 · 181a322 · 181a322
1 parent d5b3539
commit 181a322
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/includes/Parse.php b/includes/Parse.php
@@ -218,8 +218,7 @@ public function parse( $input, Parser $parser, &$reset, &$eliminate, $isParserTa
 		$numRows = count( $rows );
 		$articles = $this->processQueryResults( $rows, $parser );
 
-		global $wgDebugDumpSql;
-		if ( Hooks::getDebugLevel() >= 4 && $wgDebugDumpSql ) {
+		if ( $query->getSqlQuery() ) {
 			$this->addOutput( $query->getSqlQuery() . "\n" );
 		}
 

diff --git a/includes/Query.php b/includes/Query.php
@@ -176,7 +176,7 @@ public function __construct( Parameters $parameters ) {
 	 * @return array|bool
 	 */
 	public function buildAndSelect( bool $calcRows = false ) {
-		global $wgNonincludableNamespaces;
+		global $wgNonincludableNamespaces, $wgDebugDumpSql;
 
 		$options = [];
 
@@ -354,7 +354,9 @@ public function buildAndSelect( bool $calcRows = false ) {
 				);
 			}
 
-			$this->sqlQuery = $query;
+			if ( Hooks::getDebugLevel() >= 4 && $wgDebugDumpSql ) {
+				$this->sqlQuery = $query;
+			}
 
 			if ( $calcRows ) {
 				$calcRowsResult = $this->dbr->query( 'SELECT FOUND_ROWS() AS rowcount', __METHOD__ );