Expand pagination

.github/workflows/testing.yml

@@ -69,7 +69,7 @@ jobs:
           color: ${{ env.BADGE_COLOR }}
           path: '.github/badges/test-badge.svg'
       - name: Upload badge as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: badge
           path: '.github/badges/test-badge.svg'

src/Model/Model.php

@@ -76,6 +76,11 @@ public static function retrieve(array $condition = [], array $filter = []): Coll
     {
         self::interpret();
         $select = self::$tableName . '.' . self::$interpreter->getPrimaryKey();
+        foreach ($condition as $key => $value) {
+            if(str_contains($key, '.')) {
+                $select .= ' ' . $key;
+            }
+        }
         $results = Database::easy($select, $condition, $filter);
 
         $collection = new Collection();

src/Model/Paginate.php

@@ -53,6 +53,11 @@ public function get(): array
         $modelDescription = $this->model::declare();
         $table = array_key_first($modelDescription);
         $select = $table . '.' . $modelDescription[$table][0]['name'];
+        foreach ($condition as $key => $value) {
+            if(str_contains($key, '.')) {
+                $select .= ' ' . $key;
+            }
+        }
         $total = count(Database::easy($select, $this->condition));
         $start = ($this->page - 1) * $this->pageSize;
         $callFunctions = [];