Fix SELECT queries with zero matching rows not being logged.

Refs #14685, #14676
cakephp · Aug 5, 2020 · 386a133 · 386a133
1 parent a77d2d6
commit 386a133
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/Log/LoggingStatement.php b/Log/LoggingStatement.php
@@ -81,8 +81,7 @@ public function execute(?array $params = null): bool
         }
 
         if (preg_match('/^(?!SELECT)/i', $this->queryString)) {
-            $this->loggedQuery->numRows = $this->rowCount();
-            $this->_log();
+            $this->rowCount();
         }
 
         return $result;
@@ -96,8 +95,7 @@ public function fetch($type = self::FETCH_TYPE_NUM)
         $record = parent::fetch($type);
 
         if ($this->loggedQuery) {
-            $this->loggedQuery->numRows = $this->rowCount();
-            $this->_log();
+            $this->rowCount();
         }
 
         return $record;
@@ -111,13 +109,27 @@ public function fetchAll($type = self::FETCH_TYPE_NUM)
         $results = parent::fetchAll($type);
 
         if ($this->loggedQuery) {
-            $this->loggedQuery->numRows = $this->rowCount();
-            $this->_log();
+            $this->rowCount();
         }
 
         return $results;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function rowCount(): int
+    {
+        $result = parent::rowCount();
+
+        if ($this->loggedQuery) {
+            $this->loggedQuery->numRows = $result;
+            $this->_log();
+        }
+
+        return $result;
+    }
+
     /**
      * Copies the logging data to the passed LoggedQuery and sends it
      * to the logging system.