Determine fields based on results of query callback if one is present

DivineOmega · Mar 25, 2021 · 5106acf · 5106acf
1 parent 765657d
commit 5106acf
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Objects/Sources/EloquentSource.php b/src/Objects/Sources/EloquentSource.php
@@ -18,7 +18,14 @@ public function __construct($eloquentModelClassName, $queryCallback = null)
         $this->model = new $eloquentModelClassName();
         $this->queryCallback = $queryCallback;
 
-        $this->fields = array_keys($this->model->first()->getAttributes());
+        $query = $this->model->query();
+
+        if (is_callable($this->queryCallback)) {
+            $queryCallback = $this->queryCallback;
+            $queryCallback($query);
+        }
+
+        $this->fields = array_keys($query->first()->getAttributes());
     }
 
     public function getDataRows(int $page = 1, array $fieldsToRetrieve = []): array