Changeset 3123906

Timestamp:

07/23/2024 01:01:11 PM (19 months ago)

Author:

vnsavage

Message:

Improve last error handling: Record the last_error closer to the queries so it's not lost and don't run 'SELECT FOUND_ROWS()' if the query has failed

File:

• hyperdb/trunk/db.php (modified) (3 diffs)

hyperdb/trunk/db.php

@@ -952 +952 @@
 
             $this->result = $this->ex_mysql_query( $query, $this->dbh );
+            $this->last_error = $this->ex_mysql_error( $this->dbh );
 
             if ( $statement_after_query ) {
@@ -960 +961 @@
             ++$this->num_queries;
 
-            if ( preg_match( '/^\s*SELECT\s+SQL_CALC_FOUND_ROWS\s/i', $query ) ) {
+            if ( preg_match( '/^\s*SELECT\s+SQL_CALC_FOUND_ROWS\s/i', $query ) && false !== $this->result ) {
                 if ( false === strpos( $query, 'NO_SELECT_FOUND_ROWS' ) ) {
                     $this->timer_start();
                     $this->last_found_rows_result = $this->ex_mysql_query( 'SELECT FOUND_ROWS()', $this->dbh );
                     $elapsed                     += $this->timer_stop();
+                    $this->last_error             = $this->ex_mysql_error( $this->dbh );
                     ++$this->num_queries;
                     $query .= '; SELECT FOUND_ROWS()';
@@ -986 +988 @@
             }
         }
-
-        $this->last_error = $this->ex_mysql_error( $this->dbh );
 
         if ( $this->last_error ) {