Capture query errors for the primary query

Automattic · Jul 8, 2024 · 33d0ba8 · 33d0ba8
1 parent d8f68ef
commit 33d0ba8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/db.php b/db.php
@@ -960,7 +960,8 @@ public function query( $query ) {
 				$this->ex_mysql_query( $statement_before_query, $this->dbh );
 			}
 
-			$this->result = $this->ex_mysql_query( $query, $this->dbh );
+			$this->result     = $this->ex_mysql_query( $query, $this->dbh );
+			$this->last_error = $this->ex_mysql_error( $this->dbh );
 
 			if ( $statement_after_query ) {
 				$query_for_log = "$query_for_log; $statement_after_query";
@@ -996,7 +997,9 @@ public function query( $query ) {
 			}
 		}
 
-		$this->last_error = $this->ex_mysql_error( $this->dbh );
+		if ( $this->last_error === '' ) {
+			$this->last_error = $this->ex_mysql_error( $this->dbh );
+		}
 
 		if ( $this->last_error ) {
 			$this->last_errno = $this->ex_mysql_errno( $this->dbh );