Merge branch 'master' into develop

Author: Mikk Mihkel Nurges

Readme.md

@@ -2,6 +2,8 @@
 
 [![Latest Stable Version](https://poser.pugx.org/rebing/graphql-laravel/v/stable)](https://packagist.org/packages/rebing/graphql-laravel)
 [![License](https://poser.pugx.org/rebing/graphql-laravel/license)](https://packagist.org/packages/rebing/graphql-laravel)
+[![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](https://join.slack.com/t/rebing-graphql/shared_invite/enQtNTE5NjQzNDI5MzQ4LWVjMTMxNzIyZjBlNTFhZGQ5MDVjZDAwZDNjODA3ODE2NjdiOGJkMjMwMTZkZmNhZjhiYTE1MjEyNDk0MWJmMzk)
+
 
 Uses Facebook GraphQL with Laravel 5. It is based on the PHP implementation [here](https://github.com/webonyx/graphql-php). You can find more information about GraphQL in the [GraphQL Introduction](http://facebook.github.io/react/blog/2015/05/01/graphql-introduction.html) on the [React](http://facebook.github.io/react) blog or you can read the [GraphQL specifications](https://facebook.github.io/graphql/). This is a work in progress.
 

src/Rebing/GraphQL/Support/SelectFields.php

@@ -168,6 +168,8 @@ protected static function handleFields(array $requestedFields, $parentType, arra
                             $foreignKey = $relation->getQualifiedForeignKeyName();
                         }
 
+                        $segments = explode('.', $foreignKey);
+                        $foreignKey = end($segments);
                         $foreignKey = $parentTable ? ($parentTable . '.' . $foreignKey) : $foreignKey;
 
                         if(is_a($relation, MorphTo::class))

src/Rebing/GraphQL/Support/Type.php

@@ -123,7 +123,8 @@ public function toType()
         {
             return new InputObjectType($this->toArray());
         }
-        if ($this->enumObject) {
+        if ($this->enumObject)
+        {
             return new EnumType($this->toArray());
         }
         return new ObjectType($this->toArray());