From 61cefca11349ea3acd3322bbd9eae4c86fe4b786 Mon Sep 17 00:00:00 2001
From: Funky Waddle <paul@funkywaddle.com>
Date: Sun, 8 Feb 2026 02:48:39 -0600
Subject: [PATCH] Fix issues with missing classes when being tested in Github
 Actions

---
 .github/workflows/ci.yml         |  1 +
 src/DAO/BaseDAO.php              |  3 +-
 src/Stubs/DAO.stub               | 53 ++++++++++++--------------------
 tests/Fixtures/schema/users.yaml | 11 +++++++
 4 files changed, 34 insertions(+), 34 deletions(-)
 create mode 100644 tests/Fixtures/schema/users.yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 380efe8..8fd103e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,6 +30,7 @@ jobs:
       - name: Initialize Pairity
         run: |
           bin/pairity init
+          bin/pairity make:model tests/Fixtures/schema
 
       - name: Run tests
         run: |
diff --git a/src/DAO/BaseDAO.php b/src/DAO/BaseDAO.php
index c428f02..aa4d8f9 100644
--- a/src/DAO/BaseDAO.php
+++ b/src/DAO/BaseDAO.php
@@ -231,9 +231,10 @@ abstract class BaseDAO
      * Insert a new record.
      *
      * @param array<string, mixed> $data
+     * @param \Pairity\DTO\BaseDTO|null $dto
      * @return bool
      */
-    protected function insert(array $data): bool
+    protected function insert(array $data, ?\Pairity\DTO\BaseDTO $dto = null): bool
     {
         if ($this->getOption('tenancy', false)) {
             $tenantColumn = \Pairity\Database\Query\Scopes\TenantScope::getTenantColumn();
diff --git a/src/Stubs/DAO.stub b/src/Stubs/DAO.stub
index 30b7a3b..4a3ef79 100644
--- a/src/Stubs/DAO.stub
+++ b/src/Stubs/DAO.stub
@@ -86,8 +86,12 @@ class {{class}} extends BaseDAO
      * @param {{dto_class}} $dto
      * @return bool
      */
-    public function save({{dto_class}} $dto): bool
+    public function save(\Pairity\DTO\BaseDTO $dto): bool
     {
+        if (!$dto instanceof {{dto_class}}) {
+            return parent::save($dto);
+        }
+
         if ($this->fireModelEvent('saving', $dto) === false) {
             return false;
         }
@@ -96,9 +100,9 @@ class {{class}} extends BaseDAO
         $primaryKeyValue = $data[$this->primaryKey] ?? null;
 
         if ($primaryKeyValue === null) {
-            $result = $this->insert($dto);
+            $result = $this->insert($data, $dto);
         } else {
-            $result = $this->update($dto);
+            $result = $this->update($primaryKeyValue, $data, $dto);
         }
 
         if ($result) {
@@ -111,24 +115,19 @@ class {{class}} extends BaseDAO
     /**
      * Insert a new record.
      *
-     * @param {{dto_class}} $dto
+     * @param array $data
+     * @param \Pairity\DTO\BaseDTO|null $dto
      * @return bool
      */
-    protected function insert({{dto_class}} $dto): bool
+    protected function insert(array $data, ?\Pairity\DTO\BaseDTO $dto = null): bool
     {
-        if ($this->fireModelEvent('creating', $dto) === false) {
+        if ($dto && $this->fireModelEvent('creating', $dto) === false) {
             return false;
         }
 
-        $data = $dto->toArray();
-        $columns = implode(', ', array_keys($data));
-        $placeholders = implode(', ', array_fill(0, count($data), '?'));
-        
-        $sql = "INSERT INTO {$this->table} ({$columns}) VALUES ({$placeholders})";
-        
-        $result = $this->getConnection()->execute($sql, array_values($data)) > 0;
+        $result = parent::insert($data);
 
-        if ($result) {
+        if ($result && $dto) {
             $this->fireModelEvent('created', $dto, false);
         }
 
@@ -138,32 +137,20 @@ class {{class}} extends BaseDAO
     /**
      * Update an existing record.
      *
-     * @param {{dto_class}} $dto
+     * @param mixed $id
+     * @param array $data
+     * @param \Pairity\DTO\BaseDTO|null $dto
      * @return bool
      */
-    protected function update({{dto_class}} $dto): bool
+    protected function update(mixed $id, array $data, ?\Pairity\DTO\BaseDTO $dto = null): bool
     {
-        if ($this->fireModelEvent('updating', $dto) === false) {
+        if ($dto && $this->fireModelEvent('updating', $dto) === false) {
             return false;
         }
 
-        $data = $dto->toArray();
-        $id = $data[$this->primaryKey] ?? null;
-        $sets = [];
-        $values = [];
-        
-        foreach ($data as $column => $value) {
-            if ($column === $this->primaryKey) continue;
-            $sets[] = "{$column} = ?";
-            $values[] = $value;
-        }
-        
-        $values[] = $id;
-        $sql = "UPDATE {$this->table} SET " . implode(', ', $sets) . " WHERE {$this->primaryKey} = ?";
-        
-        $result = $this->getConnection()->execute($sql, $values) > 0;
+        $result = parent::update($id, $data, $dto);
 
-        if ($result) {
+        if ($result && $dto) {
             $this->fireModelEvent('updated', $dto, false);
         }
 
diff --git a/tests/Fixtures/schema/users.yaml b/tests/Fixtures/schema/users.yaml
new file mode 100644
index 0000000..4b90f59
--- /dev/null
+++ b/tests/Fixtures/schema/users.yaml
@@ -0,0 +1,11 @@
+columns:
+  id:
+    type: bigInteger
+    primary: true
+  email:
+    type: string
+    unique: true
+relations:
+  posts:
+    type: hasMany
+    target: posts