allow adding columns in query field

CHANGELOG.md

@@ -5,7 +5,7 @@ CHANGELOG
 --------------
 ### Fixed
 - Allow 'always' to work on object types [\#473 / tinyoverflow \#369 / zjbarg](https://github.com/rebing/graphql-laravel/pull/892)
-
+- Allow using addSelect() in relationship query scopes [\#875 / codercms](https://github.com/rebing/graphql-laravel/pull/806)
 ### Removed
 - Support for PHP 7.2, PHP 7.3 and Laravel 7.0 (all EOL) [\#914 / mfn](https://github.com/rebing/graphql-laravel/pull/914)
 

README.md

@@ -62,23 +62,32 @@ The default GraphiQL view makes use of the global `csrf_token()` helper function
 
 - [Laravel GraphQL](#laravel-graphql)
   - [Installation](#installation)
-      - [Dependencies:](#dependencies)
-      - [Installation:](#installation)
-        - [Laravel 6.0+](#laravel)
+    - [Dependencies:](#dependencies)
+    - [Installation:](#installation-1)
+      - [Laravel](#laravel)
   - [Usage](#usage)
     - [Concepts](#concepts)
       - [A word on declaring a field `nonNull`](#a-word-on-declaring-a-field-nonnull)
     - [Data loading](#data-loading)
     - [GraphiQL](#graphiql)
     - [Middleware Overview](#middleware-overview)
+      - [HTTP middleware](#http-middleware)
+      - [GraphQL execution middleware](#graphql-execution-middleware)
+      - [GraphQL resolver middleware](#graphql-resolver-middleware)
     - [Schemas](#schemas)
+      - [Schema classes](#schema-classes)
     - [Creating a query](#creating-a-query)
     - [Creating a mutation](#creating-a-mutation)
-      - [Adding validation to a mutation](#adding-validation-to-a-mutation)
       - [File uploads](#file-uploads)
-    - [Validation](#validation)  
+        - [Vue.js and Axios example](#vuejs-and-axios-example)
+        - [jQuery or vanilla javascript](#jquery-or-vanilla-javascript)
+    - [Validation](#validation)
+      - [Example defining rules in each argument](#example-defining-rules-in-each-argument)
+      - [Example using the `rules()` method](#example-using-the-rules-method)
+      - [Example using Laravel's validator directly](#example-using-laravels-validator-directly)
       - [Handling validation errors](#handling-validation-errors)
       - [Customizing error messages](#customizing-error-messages)
+      - [Misc notes](#misc-notes)
     - [Resolve method](#resolve-method)
     - [Resolver middleware](#resolver-middleware)
       - [Defining middleware](#defining-middleware)
@@ -97,6 +106,7 @@ The default GraphiQL view makes use of the global `csrf_token()` helper function
     - [Enums](#enums)
     - [Unions](#unions)
     - [Interfaces](#interfaces)
+      - [Supporting custom queries on interface relations](#supporting-custom-queries-on-interface-relations)
       - [Sharing interface fields](#sharing-interface-fields)
     - [Input Object](#input-object)
     - [Type modifiers](#type-modifiers)
@@ -105,8 +115,11 @@ The default GraphiQL view makes use of the global `csrf_token()` helper function
     - [Field deprecation](#field-deprecation)
     - [Default field resolver](#default-field-resolver)
     - [Macros](#macros)
-    - [Automatic Persisted Queries support](#automatic-persisted-queries-support) 
-    - [Misc features](#misc-features)
+    - [Automatic Persisted Queries support](#automatic-persisted-queries-support)
+      - [Notes](#notes)
+      - [Client example](#client-example)
+  - [Misc features](#misc-features)
+    - [Detecting unused variables](#detecting-unused-variables)
   - [Configuration options](#configuration-options)
   - [Guides](#guides)
     - [Upgrading from v1 to v2](#upgrading-from-v1-to-v2)
@@ -1789,7 +1802,8 @@ class UserType extends GraphQLType
                 // $ctx is the GraphQL context (can be customized by overriding `\Rebing\GraphQL\GraphQLController::queryContext`
                 // The return value should be the query builder or void
                 'query'         => function (array $args, $query, $ctx): void {
-                    $query->where('posts.created_at', '>', $args['date_from']);
+                    $query->addSelect('some_column')
+                          ->where('posts.created_at', '>', $args['date_from']);
                 }
             ]
         ];

src/Support/SelectFields.php

@@ -102,7 +102,7 @@ public static function getSelectableFieldsAndRelations(
                 $query = $customQuery($requestedFields['args'], $query, $ctx) ?? $query;
             }
 
-            $query->select($select);
+            $query->addSelect($select);
             $query->with($with);
         };
     }

tests/Database/SelectFields/QueryArgsAndContextTests/NestedRelationLoadingTest.php

@@ -968,4 +968,74 @@ public function testRelationshipAlias(): void
 
         self::assertSame($expectedResult, $result);
     }
+
+    public function testCustomQueryAllowColumnToBeAdded(): void
+    {
+        /** @var User[] $users */
+        $users = factory(User::class, 2)
+            ->create()
+            ->each(function (User $user): void {
+                /** @var Post $post */
+                $post = factory(Post::class)
+                    ->create([
+                        'flag' => true,
+                        'user_id' => $user->id,
+                    ]);
+            });
+
+        $graphql = <<<'GRAQPHQL'
+{
+  users(select: true, with: true) {
+    id
+    name
+    postsWithExtraField {
+      body
+      id
+      title
+    }
+  }
+}
+GRAQPHQL;
+
+        $this->sqlCounterReset();
+
+        $result = $this->httpGraphql($graphql);
+
+        $this->assertSqlQueries(
+            <<<'SQL'
+select "users"."id", "users"."name" from "users" order by "users"."id" asc;
+select 42 as meaning_of_life, "posts"."body", "posts"."id", "posts"."title", "posts"."user_id" from "posts" where "posts"."user_id" in (?, ?) order by "posts"."id" asc;
+SQL
+        );
+
+        $expectedResult = [
+            'data' => [
+                'users' => [
+                    [
+                        'id' => (string) $users[0]->id,
+                        'name' => $users[0]->name,
+                        'postsWithExtraField' => [
+                            [
+                                'body' => $users[0]->posts[0]->body,
+                                'id' => (string) $users[0]->posts[0]->id,
+                                'title' => $users[0]->posts[0]->title,
+                            ],
+                        ],
+                    ],
+                    [
+                        'id' => (string) $users[1]->id,
+                        'name' => $users[1]->name,
+                        'postsWithExtraField' => [
+                            [
+                                'body' => $users[1]->posts[0]->body,
+                                'id' => (string) $users[1]->posts[0]->id,
+                                'title' => $users[1]->posts[0]->title,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        self::assertSame($expectedResult, $result);
+    }
 }

tests/Database/SelectFields/QueryArgsAndContextTests/UserType.php

@@ -5,6 +5,7 @@
 
 use GraphQL\Type\Definition\Type;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Facades\DB;
 use Rebing\GraphQL\Support\Facades\GraphQL;
 use Rebing\GraphQL\Support\Type as GraphQLType;
 use Rebing\GraphQL\Tests\Support\Models\User;
@@ -48,6 +49,15 @@ public function fields(): array
                 'query' => function (array $args, HasMany $query): HasMany {
                     $query->where('posts.flag', '=', 1);
 
+                    return $query;
+                },
+            ],
+            'postsWithExtraField' => [
+                'type' => Type::nonNull(Type::listOf(Type::nonNull(GraphQL::type('Post')))),
+                'alias' => 'posts',
+                'query' => function (array $args, HasMany $query): HasMany {
+                    $query->addSelect(DB::raw('42 as meaning_of_life'));
+
                     return $query;
                 },
             ],