refactor tests

Author: michalsn

system/Database/BasePreparedQuery.php

@@ -83,7 +83,7 @@ public function prepare(string $sql, array $options = [], string $queryClass = Q
         // We only support positional placeholders (?), so convert
         // named placeholders (:name or :name:) while leaving dialect
         // syntax like PostgreSQL casts (::type) untouched.
-        $sql = preg_replace('/(?<!:):([a-zA-Z_][a-zA-Z0-9_]*):?(?!:)/', '?', $sql);
+        $sql = preg_replace('/(?<!:):([a-zA-Z_]\w*):?(?!:)/', '?', $sql);
 
         /** @var Query $query */
         $query = new $queryClass($this->db);

tests/_support/Mock/MockPreparedQuery.php

@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Mock;
+
+use CodeIgniter\Database\BasePreparedQuery;
+
+/**
+ * @internal
+ */
+final class MockPreparedQuery extends BasePreparedQuery
+{
+    public string $preparedSql = '';
+
+    /**
+     * @param array<string, mixed> $options
+     */
+    public function _prepare(string $sql, array $options = []): self
+    {
+        $this->preparedSql = $sql;
+
+        return $this;
+    }
+
+    /**
+     * @param array<int, mixed> $data
+     */
+    public function _execute(array $data): bool
+    {
+        return true;
+    }
+
+    public function _getResult()
+    {
+        return null;
+    }
+
+    protected function _close(): bool
+    {
+        return true;
+    }
+}

tests/system/Database/BasePreparedQueryTest.php

@@ -16,6 +16,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 use PHPUnit\Framework\Attributes\Group;
+use Tests\Support\Mock\MockPreparedQuery;
 
 /**
  * @internal
@@ -53,32 +54,8 @@ public function testPrepareDoesNotConvertTimeLikeLiterals(): void
         $this->assertSame("SELECT '12:34' AS time_value, ? AS id", $query->preparedSql);
     }
 
-    private function createPreparedQuery(): BasePreparedQuery
+    private function createPreparedQuery(): MockPreparedQuery
     {
-        return new class (new MockConnection([])) extends BasePreparedQuery {
-            public string $preparedSql = '';
-
-            public function _prepare(string $sql, array $options = [])
-            {
-                $this->preparedSql = $sql;
-
-                return $this;
-            }
-
-            public function _execute(array $data): bool
-            {
-                return true;
-            }
-
-            public function _getResult()
-            {
-                return null;
-            }
-
-            protected function _close(): bool
-            {
-                return true;
-            }
-        };
+        return new MockPreparedQuery(new MockConnection([]));
     }
 }

tests/system/Database/Live/PreparedQueryTest.php

@@ -45,7 +45,7 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
-        if ($this->query === null) {
+        if (! $this->query instanceof BasePreparedQuery) {
             return;
         }
 
@@ -115,11 +115,13 @@ public function testPrepareReturnsManualPreparedQuery(): void
 
     public function testPrepareAndExecuteManualQueryWithNamedPlaceholdersKeepsTimeLiteral(): void
     {
-        $this->query = $this->db->prepare(static function ($db): Query {
+        // Quote alias to keep a consistent property name across drivers (OCI8 uppercases unquoted aliases)
+        $timeValue   = $this->db->protectIdentifiers('time_value');
+        $this->query = $this->db->prepare(static function ($db) use ($timeValue): Query {
             $sql = 'SELECT '
                 . $db->protectIdentifiers('name') . ', '
                 . $db->protectIdentifiers('email')
-                . ", '12:34' AS time_value "
+                . ", '12:34' AS " . $timeValue . ' '
                 . 'FROM ' . $db->protectIdentifiers($db->DBPrefix . 'user')
                 . ' WHERE '
                 . $db->protectIdentifiers('name') . ' = :name:'
@@ -130,7 +132,7 @@ public function testPrepareAndExecuteManualQueryWithNamedPlaceholdersKeepsTimeLi
 
         $preparedSql = $this->query->getQueryString();
 
-        $this->assertStringContainsString("'12:34' AS time_value", $preparedSql);
+        $this->assertStringContainsString("'12:34' AS " . $timeValue, $preparedSql);
 
         if ($this->db->DBDriver === 'Postgre') {
             $this->assertStringContainsString(' = $1', $preparedSql);