Añade soporte para obtención de consultas con bindings en Query Builders (getQueryWithBindings) y refactoriza métodos en Table, TableEntity, y EntityManager para retornar resultados consistentes y respetar campos reservados.

Author: mrojas16

src/Connection/PDOConnection.php

@@ -2,6 +2,7 @@
 
 namespace PhobosFramework\Database\Connection;
 
+use Exception;
 use PDO;
 use PDOStatement;
 use PDOException;
@@ -84,14 +85,15 @@ public function getPDO(): PDO {
 
     /**
      * {@inheritdoc}
+     * @throws QueryException
      */
     public function execute(string $sql, array $params = []): PDOStatement {
         try {
             $pdo = $this->getPDO();
             $stmt = $pdo->prepare($sql);
-            $stmt->execute($params);
+            $_ = $stmt->execute($params);
             return $stmt;
-        } catch (PDOException $e) {
+        } catch (Exception $e) {
             throw new QueryException(
                 "Query execution failed: {$e->getMessage()}",
                 (int)$e->getCode(),

src/Entity/EntityManager.php

@@ -42,6 +42,15 @@ abstract class EntityManager implements EntityInterface {
      */
     protected array $_dirty = [];
 
+    /**
+     * Campos reservados (no se pueden modificar)
+     */
+    protected array $_reserved = [
+        'schema',
+        'entity',
+        'pk'
+    ];
+
     /**
      * {@inheritdoc}
      */
@@ -160,7 +169,9 @@ public function toArray(bool $onlyDirty = false): array {
                 continue;
             }
 
-            $data[$name] = $this->$name;
+            if(!in_array($name, $this->_reserved)) {
+                $data[$name] = $this->$name;
+            }
         }
 
         return $data;

src/Entity/Table.php

@@ -29,7 +29,7 @@ public static function find(
         ?int              $limitFrom = null,
         ?int              $limitTo = null,
         bool              $dryRun = false
-    ): array|string;
+    ): array;
 
     /**
      * Busca el primer registro que coincida
@@ -43,7 +43,7 @@ public static function findFirst(
         array             $where = [],
         string|array|null $order = null,
         bool              $dryRun = false
-    ): static|null|string;
+    ): static|null|array;
 
     /**
      * Elimina registros
@@ -57,7 +57,7 @@ public static function delete(
         array $where,
         ?int  $limit = null,
         bool  $dryRun = false
-    ): int|string;
+    ): int|array;
 
     /**
      * Guarda el registro (INSERT o UPDATE según corresponda)

src/Entity/TableEntity.php

@@ -33,7 +33,7 @@ public static function find(
         ?int              $limitFrom = null,
         ?int              $limitTo = null,
         bool              $dryRun = false
-    ): array|string {
+    ): array {
         $qb = static::query()
             ->select('*')
             ->from(static::getIdentification());
@@ -51,7 +51,7 @@ public static function find(
         }
 
         if ($dryRun) {
-            return $qb->getQuery();
+            return $qb->getQueryWithBindings();
         }
 
         $rows = $qb->fetch();
@@ -65,7 +65,7 @@ public static function findFirst(
         array             $where = [],
         string|array|null $order = null,
         bool              $dryRun = false
-    ): static|null|string {
+    ): static|null|array {
         $qb = static::query()
             ->select('*')
             ->from(static::getIdentification())
@@ -80,7 +80,7 @@ public static function findFirst(
         }
 
         if ($dryRun) {
-            return $qb->getQuery();
+            return $qb->getQueryWithBindings();
         }
 
         $row = $qb->fetchFirst();
@@ -122,7 +122,7 @@ public static function delete(
         array $where,
         ?int  $limit = null,
         bool  $dryRun = false
-    ): int|string {
+    ): int|array {
         $deleteQuery = (new DeleteQuery(static::getConnection()))
             ->from(static::getIdentification())
             ->where($where);
@@ -132,7 +132,7 @@ public static function delete(
         }
 
         if ($dryRun) {
-            return $deleteQuery->getQuery();
+            return $deleteQuery->getQueryWithBindings();
         }
 
         return $deleteQuery->execute();
@@ -160,7 +160,6 @@ public function save(): bool {
      */
     protected function performInsert(): bool {
         $data = $this->toArray();
-
         // Remover PKs auto-increment que estén vacías
         foreach (static::getPrimaryKey() as $pk) {
             if (empty($data[$pk])) {

src/QueryBuilder/DeleteQuery.php

@@ -63,6 +63,16 @@ public function getQuery(): string {
         return $sql;
     }
 
+    /**
+     * Genera el SQL con los bindings
+     */
+    public function getQueryWithBindings(): array {
+        return [
+            'query' => $this->getQuery(),
+            'bindings' => $this->getBindings()
+        ];
+    }
+
     /**
      * Obtiene los bindings
      */

src/QueryBuilder/InsertQuery.php

@@ -68,6 +68,16 @@ public function getQuery(): string {
         return $this->getSingleInsertQuery();
     }
 
+    /**
+     * Genera el SQL con los bindings
+     */
+    public function getQueryWithBindings(): array {
+        return [
+            'query' => $this->getQuery(),
+            'bindings' => $this->getBindings()
+        ];
+    }
+
     /**
      * Genera SQL para insert simple
      */

src/QueryBuilder/QueryBuilder.php

@@ -199,6 +199,13 @@ public function fetchColumn(string|int $column = 0): mixed {
         return $result[$column] ?? null;
     }
 
+    public function getQueryWithBindings(): array {
+        return [
+            'query' => $this->getQuery(),
+            'bindings' => $this->getBindings()
+        ];
+    }
+
     public function getQuery(): string {
         $parts = [];
 

src/QueryBuilder/UpdateQuery.php

@@ -54,8 +54,10 @@ public function getQuery(): string {
         }
         $setStr = implode(', ', $setParts);
 
-        /** @noinspection SqlNoDataSourceInspection */
-        /** @noinspection SqlWithoutWhere */
+        /**
+         * @noinspection SqlNoDataSourceInspection
+         * @noinspection SqlWithoutWhere
+         */
         $sql = "UPDATE {$this->table} SET {$setStr}";
 
         if ($this->whereClause->hasConditions()) {
@@ -65,6 +67,16 @@ public function getQuery(): string {
         return $sql;
     }
 
+    /**
+     * Genera el SQL con los bindings
+     */
+    public function getQueryWithBindings(): array {
+        return [
+            'query' => $this->getQuery(),
+            'bindings' => $this->getBindings()
+        ];
+    }
+
     /**
      * Obtiene los bindings
      */