Move raw selects to separate trait and build entities by default

Author: Composite PHP

doc/cache.md

@@ -46,17 +46,15 @@ class PostsTable extends AbstractCachedTable
 
     public function findByPk(int $id): ?Post
     {
-        return $this->createEntity($this->_findByPkCached($id));
+        return $this->_findByPkCached($id);
     }
 
     /**
     * @return Post[]
     */
     public function findAllFeatured(): array
     {
-        return $this->createEntities($this->_findAll(
-            ['is_featured' => true],
-        ));
+        return $this->_findAll(['is_featured' => true]);
     }
 
     public function countAllFeatured(): int

doc/example.md

@@ -43,17 +43,15 @@ class UsersTable extends \Composite\DB\AbstractTable
 
     public function findByPk(int $id): ?User
     {
-        return $this->createEntity($this->_findByPk($id));
+        return $this->_findByPk($id);
     }
 
     /**
      * @return User[]
      */
     public function findAllActive(): array
     {
-        return $this->createEntities($this->_findAll(
-            ['status' => Status::ACTIVE],
-        ));
+        return $this->_findAll(['status' => Status::ACTIVE]);
     }
 
     public function countAllActive(): int

doc/table.md

@@ -38,15 +38,15 @@ class UsersTable extends AbstractTable
 
     public function findOne(int $id): ?User
     {
-        return $this->createEntity($this->_findOne($id));
+        return $this->_findByPk($id);
     }
 
     /**
      * @return User[]
      */
     public function findAll(): array
     {
-        return $this->createEntities($this->_findAll());
+        return $this->_findAll();
     }
 
     public function countAll(): int
@@ -67,13 +67,12 @@ Example with internal helper:
  */
 public function findAllActiveAdults(): array
 {
-    $rows = $this->_findAll(
+    return $this->_findAll(
         new Where(
             'age > :age AND status = :status',
             ['age' => 18, 'status' => Status::ACTIVE->name],
         )
     );
-    return $this->createEntities($rows);
 }
 ```
 
@@ -84,11 +83,10 @@ Or it might be simplified to:
  */
 public function findAllActiveAdults(): array
 {
-    $rows = $this->_findAll([
+    return $this->_findAll([
         'age' => ['>', 18],
         'status' => Status:ACTIVE,
     ]);
-    return $this->createEntities($rows);
 }
 ```
 

src/AbstractCachedTable.php

@@ -2,14 +2,14 @@
 
 namespace Composite\DB;
 
-use Composite\DB\Exceptions\DbException;
-use Composite\DB\Tests\TestStand\Entities\TestAutoincrementEntity;
 use Composite\Entity\AbstractEntity;
 use Psr\SimpleCache\CacheInterface;
 use Ramsey\Uuid\UuidInterface;
 
 abstract class AbstractCachedTable extends AbstractTable
 {
+    use SelectRawTrait;
+
     protected const CACHE_VERSION = 1;
 
     public function __construct(
@@ -94,44 +94,47 @@ private function collectCacheKeysByEntity(AbstractEntity $entity): array
     }
 
     /**
-     * @return array<string, mixed>|null
+     * @return AbstractEntity|null
      */
-    protected function _findByPkCached(mixed $pk, null|int|\DateInterval $ttl = null): ?array
+    protected function _findByPkCached(mixed $pk, null|int|\DateInterval $ttl = null): mixed
     {
         return $this->_findOneCached($this->getPkCondition($pk), $ttl);
     }
 
     /**
-     * @param array<string, mixed> $condition
+     * @param array<string, mixed> $where
      * @param int|\DateInterval|null $ttl
-     * @return array<string, mixed>|null
+     * @return AbstractEntity|null
      */
-    protected function _findOneCached(array $condition, null|int|\DateInterval $ttl = null): ?array
+    protected function _findOneCached(array $where, null|int|\DateInterval $ttl = null): mixed
     {
-        return $this->getCached(
-            $this->getOneCacheKey($condition),
-            fn() => $this->_findOne($condition),
+        $row = $this->getCached(
+            $this->getOneCacheKey($where),
+            fn() => $this->_findOneRaw($where),
             $ttl,
-        ) ?: null;
+        );
+        return $this->createEntity($row);
     }
 
     /**
      * @param array<string, mixed>|Where $where
      * @param array<string, string>|string $orderBy
-     * @return array<string, mixed>[]
+     * @return array<AbstractEntity>|array<array-key, AbstractEntity>
      */
     protected function _findAllCached(
         array|Where $where = [],
         array|string $orderBy = [],
         ?int $limit = null,
         null|int|\DateInterval $ttl = null,
+        ?string $keyColumnName = null,
     ): array
     {
-        return $this->getCached(
+        $rows = $this->getCached(
             $this->getListCacheKey($where, $orderBy, $limit),
-            fn() => $this->_findAll(where: $where, orderBy: $orderBy, limit: $limit),
+            fn() => $this->_findAllRaw(where: $where, orderBy: $orderBy, limit: $limit),
             $ttl,
         );
+        return $this->createEntities($rows, $keyColumnName);
     }
 
     /**
@@ -165,10 +168,14 @@ protected function getCached(string $cacheKey, callable $dataCallback, null|int|
     /**
      * @param mixed[] $ids
      * @param int|\DateInterval|null $ttl
-     * @return array<array<string, mixed>>
+     * @return array<AbstractEntity>|array<array-key, AbstractEntity>
      * @throws \Psr\SimpleCache\InvalidArgumentException
      */
-    protected function _findMultiCached(array $ids, null|int|\DateInterval $ttl = null): array
+    protected function _findMultiCached(
+        array $ids,
+        null|int|\DateInterval $ttl = null,
+        ?string $keyColumnName = null,
+    ): array
     {
         $result = $cacheKeys = $foundIds = [];
         foreach ($ids as $id) {
@@ -191,7 +198,7 @@ protected function _findMultiCached(array $ids, null|int|\DateInterval $ttl = nu
                 $result[] = $row;
             }
         }
-        return $result;
+        return $this->createEntities($result, $keyColumnName);
     }
 
     /**
@@ -271,7 +278,7 @@ protected function buildCacheKey(mixed ...$parts): string
 
     private function formatStringForCacheKey(string $string): string
     {
-        $string = mb_strtolower($string);
+        $string = strtolower($string);
         $string = str_replace(['!=', '<>', '>', '<', '='], ['_not_', '_not_', '_gt_', '_lt_', '_eq_'], $string);
         $string =  (string)preg_replace('/\W/', '_', $string);
         return trim((string)preg_replace('/_+/', '_', $string), '_');