Enhancement: Support for models with different database connection pr…

…operty
Power-Components · Dec 9, 2024 · adee8b6 · adee8b6
1 parent c30c4fc
commit adee8b6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/DataSource/Builder.php b/src/DataSource/Builder.php
@@ -253,10 +253,14 @@ private function filterNestedRelation(string $table, array $columns, string $sea
 
     private function getColumnList(string $modelTable): array
     {
+        $connection = $this->query instanceof EloquentBuilder
+            ? $this->query->getModel()->getConnection()->getName()
+            : $this->query->getConnection()->getName();
+
         try {
             return PowerGridTableCache::getOrCreate(
                 $modelTable,
-                fn () => collect(Schema::getColumns($modelTable))
+                fn () => collect(Schema::connection($connection)->getColumns($modelTable))
                     ->pluck('type', 'name')
                     ->toArray()
             );
@@ -266,7 +270,7 @@ private function getColumnList(string $modelTable): array
                 'throwable' => $throwable->getTrace(),
             ]);
 
-            return Schema::getColumnListing($modelTable);
+            return Schema::connection($connection)->getColumnListing($modelTable);
         }
     }