fix: allow usage of the main table filtering the fields

spatie · Dec 12, 2024 · 07ae20d · 07ae20d
1 parent beb5862
commit 07ae20d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Concerns/AddsFieldsToQuery.php b/src/Concerns/AddsFieldsToQuery.php
@@ -42,7 +42,12 @@ protected function addRequestedModelFieldsToQuery(): void
             $fields = $fields->mapWithKeys(fn ($fields, $table) => [$table => collect($fields)->map(fn ($field) => Str::snake($field))->toArray()]);
         }
 
-        $modelFields = $fields->has($modelTableName) ? $fields->get($modelTableName) : $fields->get('_');
+        // Apply additional table name conversion based on strategy
+        if (config('query-builder.convert_relation_table_name_strategy', false) === 'camelCase') {
+            $modelFields = $fields->has(Str::camel($modelTableName)) ? $fields->get(Str::camel($modelTableName)) : $fields->get('_');
+        } else {
+            $modelFields = $fields->has($modelTableName) ? $fields->get($modelTableName) : $fields->get('_');
+        }
 
         if (empty($modelFields)) {
             return;