Limit Query Select to Model Table

src/Execution/Arguments/ArgumentSet.php

@@ -3,6 +3,9 @@
 namespace Nuwave\Lighthouse\Execution\Arguments;
 
 use Closure;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Relations\Relation;
+use Illuminate\Database\Query\Builder;
 use Nuwave\Lighthouse\Schema\Directives\RenameDirective;
 use Nuwave\Lighthouse\Schema\Directives\SpreadDirective;
 use Nuwave\Lighthouse\Support\Contracts\ArgBuilderDirective;
@@ -137,16 +140,30 @@ function ($value) {
     /**
      * Apply ArgBuilderDirectives and scopes to the builder.
      *
-     * @param  \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Relations\Relation  $builder
+     * @param  \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Laravel\Scout\Builder|\Illuminate\Database\Eloquent\Relations\Relation  $builder
      * @param  string[]  $scopes
      * @param  \Closure  $directiveFilter
      *
-     * @return \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Relations\Relation
+     * @return \Illuminate\Database\Query\Builder|\Illuminate\Database\Eloquent\Builder|\Laravel\Scout\Builder|\Illuminate\Database\Eloquent\Relations\Relation
      */
     public function enhanceBuilder($builder, array $scopes, Closure $directiveFilter = null)
     {
         self::applyArgBuilderDirectives($this, $builder, $directiveFilter);
 
+        $baseBuilder = null;
+        if ($builder instanceof Builder) {
+            $baseBuilder = $builder;
+        } elseif ($builder instanceof EloquentBuilder) {
+            $baseBuilder = $builder->getQuery();
+        } elseif ($builder instanceof Relation) {
+            $baseBuilder = $builder->getBaseQuery();
+        }
+
+        if ($baseBuilder && is_null($baseBuilder->columns)) {
+            // Fix a long standing issue within Eloquent https://github.com/laravel/framework/issues/4962
+            $builder->select($baseBuilder->from.'.*');
+        }
+
         foreach ($scopes as $scope) {
             call_user_func([$builder, $scope], $this->toArray());
         }

tests/Unit/Database/ColumnSelectTest.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Tests\Unit\Database;
+
+use Tests\DBTestCase;
+use Tests\Utils\Models\Team;
+use Tests\Utils\Models\User;
+
+class ColumnSelectTest extends DBTestCase
+{
+    protected $schema = /** @lang GraphQL */ '
+    type Query {
+        usersWithTeam(
+            team: ID! @scope(name: "withTeam")
+        ): [User!] @all
+    }
+
+    type User {
+        id: ID!
+        team: Team @belongsTo
+    }
+
+    type Team {
+        id: ID!
+    }
+    ';
+
+    public function testSelectsSameColumn(): void
+    {
+        $team = factory(Team::class)->create();
+        factory(User::class, 2)->create([
+            'team_id' => $team->id,
+        ]);
+
+        $this->graphQL(/** @lang GraphQL */ '
+        query {
+            usersWithTeam(team: 1) {
+                id
+            }
+        }
+        ')->assertJson([
+            'data' => [
+                'usersWithTeam' => [
+                    [
+                        'id' => '1',
+                    ],
+                    [
+                        'id' => '2',
+                    ],
+                ],
+            ],
+        ]);
+    }
+}

tests/Utils/Models/User.php

@@ -70,6 +70,13 @@ public function scopeNamed(Builder $query): Builder
         return $query->whereNotNull('name');
     }
 
+    public function scopeWithTeam(Builder $builder, $teamId): Builder
+    {
+        return $builder
+            ->join('teams', 'teams.id', '=', 'users.team_id')
+            ->where('teams.id', '=', $teamId);
+    }
+
     public function tasksLoaded(): bool
     {
         return $this->relationLoaded('tasks');