Fix query count (#777)

Author: Tigrov

.github/workflows/active-record.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-active-record-${{ matrix.os }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.1.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       EXTENSIONS: pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv-5.10.1
 
     runs-on: ${{ matrix.os }}

.github/workflows/db-mariadb.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-mariadb-${{ matrix.mariadb }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       CURRENT_PACKAGE: db-mysql
       EXTENSIONS: pdo, pdo_mysql
 

.github/workflows/db-mssql.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-mssql-${{ matrix.mssql }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       CURRENT_PACKAGE: db-mssql
       EXTENSIONS: pdo, pdo_sqlsrv-5.10.1
 

.github/workflows/db-mysql.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-mysql-${{ matrix.mysql }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       CURRENT_PACKAGE: db-mysql
       EXTENSIONS: pdo, pdo_mysql
 

.github/workflows/db-oracle.yml

@@ -27,7 +27,7 @@ jobs:
 
     env:
       CURRENT_PACKAGE: db-oracle
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       EXTENSIONS: pdo, pdo_oci
 
     runs-on: ${{ matrix.os }}

.github/workflows/db-pgsql.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-pgsql-${{ matrix.pgsql }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       CURRENT_PACKAGE: db-pgsql
       EXTENSIONS: pdo, pdo_pgsql
 

.github/workflows/db-sqlite.yml

@@ -26,7 +26,7 @@ jobs:
     name: PHP ${{ matrix.php }}-sqlite-${{ matrix.os }}
 
     env:
-      COMPOSER_ROOT_VERSION: 1.0.0
+      COMPOSER_ROOT_VERSION: 1.2.0
       CURRENT_PACKAGE: db-sqlite
       EXTENSIONS: pdo, pdo_sqlite
 

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## 1.2.1 under development
 
-- no changes in this release.
+- Bug #777: Fix `Query::count()` when it returns an incorrect value if the result is greater
+  than `PHP_INT_MAX` (@Tigrov)
 
 ## 1.2.0 November 12, 2023
 

src/Query/Query.php

@@ -293,10 +293,14 @@ public function column(): array
 
     public function count(string $sql = '*'): int|string
     {
-        return match ($this->emulateExecution) {
-            true => 0,
-            false => is_numeric($count = $this->queryScalar("COUNT($sql)")) ? (int) $count : 0,
-        };
+        /** @var int|string|null $count */
+        $count = $this->queryScalar("COUNT($sql)");
+
+        if ($count === null) {
+            return 0;
+        }
+
+        return $count <= PHP_INT_MAX ? (int) $count : $count;
     }
 
     public function createCommand(): CommandInterface

tests/AbstractQueryTest.php

@@ -787,4 +787,18 @@ public function testNormalizeSelect(array|string|Expression $columns, array|stri
         $query->select($columns);
         $this->assertEquals($expected, $query->getSelect());
     }
+
+    public function testCountGreaterThanPhpIntMax(): void
+    {
+        $query = $this->getMockBuilder(Query::class)
+            ->setConstructorArgs([$this->getConnection()])
+            ->onlyMethods(['queryScalar'])
+            ->getMock();
+
+        $query->expects($this->once())
+            ->method('queryScalar')
+            ->willReturn('12345678901234567890');
+
+        $this->assertSame('12345678901234567890', $query->count());
+    }
 }