Always use the fully qualified name for the keys, solves problems with queries that contain joins

Author: Marcel Gwerder

src/Parser.php

@@ -5,6 +5,8 @@
 use \Illuminate\Database\Eloquent\Relations\HasMany;
 use \Illuminate\Database\Eloquent\Relations\BelongsTo;
 use \Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use \Illuminate\Database\Eloquent\Relations\MorphOne;
+use \Illuminate\Database\Eloquent\Relations\MorphMany;
 use \Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use \Illuminate\Database\Query\Builder as QueryBuilder;
 use \Illuminate\Support\Facades\Config;
@@ -406,36 +408,36 @@ protected function parseWith($withParam)
 				}
 
 				$relation = call_user_func([$previousModel, $part]);
-				$model = $relation->getModel();
 				$relationType = $this->getRelationType($relation);
 
-				if($relationType === 'HasManyThrough') 
+				if($relationType === 'BelongsTo') 
 				{
-					$firstKey = $model->getKeyName();
-					$secondKey = null;
-				}
-				else 
-				{
-					$primaryKey = $model->getKeyName();
-					$foreignKey = $relation->getForeignKey();
-				}
-
-				//Switch keys according to the type of relationship
-				if($relationType === 'HasOne' || $relationType === 'HasMany' || $relationType === 'BelongsToMany')
+					$firstKey = $relation->getQualifiedForeignKey();
+					$secondKey = $relation->getQualifiedParentKeyName();
+				} 
+				else if($relationType === 'HasMany' || $relationType === 'HasOne') 
 				{
-					$firstKey = $primaryKey;
-					$secondKey = $foreignKey;
-				}
-				else if($relationType === 'BelongsTo')
+					$firstKey = $relation->getQualifiedParentKeyName();
+					$secondKey = $relation->getForeignKey();
+				} 
+				else if($relationType === 'BelongsToMany') 
 				{
-					$firstKey = $foreignKey;
-					$secondKey = $primaryKey;
+					$firstKey = $relation->getQualifiedParentKeyName();
+					$secondKey = $relation->getRelated()->getQualifiedKeyName();
 				} 
+				else if($relationType === 'HasManyThrough') 
+				{
+					$firstKey = $relation->getHasCompareKey();
+					$secondKey = null;
+				}
+				else {
+					die('Relation type not supported!');
+				}
 
 				//Check if we're on level 1 (e.g. a and not a.b)
 				if($firstKey !== null && $previousHistoryPath == '')
 				{
-					if($fieldsCount > 0 && !in_array($primaryKey, $fields))
+					if($fieldsCount > 0 && !in_array($firstKey, $fields))
 					{
 						$fields[] = $firstKey;
 					}
@@ -453,7 +455,7 @@ protected function parseWith($withParam)
 					$withHistory[$currentHistoryPath]['fields'][] = $secondKey;
 				}
 
-				$previousModel = $model;
+				$previousModel = $relation->getModel();
 			}
 
 			unset($previousModel);
@@ -788,6 +790,16 @@ protected function getRelationType($relation)
 		{
 			return 'HasManyThrough';
 		}
+
+		if($relation instanceof MorphOne)
+		{
+			return 'MorphOne';
+		}
+
+		if($relation instanceof MorphMany)
+		{
+			return 'MorphMany';
+		}
 	}
 
 	/**

tests/ApiHandlerTest.php

@@ -95,6 +95,7 @@ public function setUp()
 		$processor = new Illuminate\Database\Query\Processors\MySqlProcessor;
 		$connection = m::mock('Illuminate\Database\ConnectionInterface', ['getQueryGrammar' => $grammar, 'getPostProcessor' => $processor]);
 		$connection->shouldReceive('select')->once()->with('select * from `posts`', [])->andReturn($this->data);
+		$connection->shouldReceive('select')->once()->with('select * from `posts`', [], true)->andReturn($this->data);
 		$connection->shouldReceive('raw')->once()->with('MATCH(title,description) AGAINST("Something to search" IN BOOLEAN MODE) as `_score`')
 				   ->andReturn($this->fulltextSelectExpression);
 		$connection->shouldReceive('getPdo')->once()->andReturn($pdo);
@@ -224,7 +225,7 @@ public function testGetBuilder()
 		$this->assertArrayHasKey('comments.user', $eagerLoads);
 
 		//Check if auto fields are set on the base query
-		$this->assertContains('id', $columns);
+		$this->assertContains('posts.id', $columns);
 
 		//Check if fields are set on the "comments" relation query 
 		$query = $post->newQuery();