fix case where PK != 'id'

Author: mibk

LeanMapperQuery/Query.php

@@ -334,9 +334,17 @@ protected function parseStatement($statement, $replacePlaceholders = NULL)
 							// NOTE: Traversing to a related entity is necessary even for the HasOne and HasMany
 							//  relationships if there are implicit filters to be applied.
 							$this->triggerJoin();
-							list(, $properties) = $this->traverseToRelatedEntity($tableName, $tableNameAlias, $property);
+							list($entityClass, $properties) = $this->traverseToRelatedEntity($tableName, $tableNameAlias, $property);
 							$column = $this->mapper->getPrimaryKey($tableName);
-							$property = $properties[$column];
+							$property = NULL;
+							foreach ($properties as $prop) {
+								if ($prop->getColumn() === $column) {
+									$property = $prop;
+								}
+							}
+							if (!$property) {
+								throw new InvalidStateException("Entity '$entityClass' doesn't have any field corresponding to the primary key column '$column'.");
+							}
 						} else {
 							$column = $property->getColumn();
 							if ($column === NULL) {

tests/LeanMapperQuery/Query.joins.phpt

@@ -10,6 +10,23 @@ use Tester\Assert;
 
 require_once __DIR__ . '/../bootstrap.php';
 
+class Test2Mapper extends TestMapper
+{
+	public function getPrimaryKey($table)
+	{
+		if ($table === 'author') {
+			return 'id_author';
+		}
+		return 'id';
+	}
+
+	public function getRelationshipColumn($sourceTable, $targetTable)
+	{
+		return $targetTable . '_id';
+	}
+}
+$mapper = new Test2Mapper;
+
 /**
  * @property int    $id
  * @property string $name
@@ -34,16 +51,24 @@ class Book extends Entity
 }
 
 /**
- * @property int         $id
+ * @property int         $id            (id_author)
  * @property string      $name
  * @property Book[]      $books         m:belongsToMany
  * @property Book[]      $reviewedBooks m:belongsToMany(reviewer_id)
+ * @property Foo         $foo           m:hasOne
  * @property string|NULL $web
  */
 class Author extends Entity
 {
 }
 
+/**
+ * @property int $id (id_foo)
+ */
+class Foo extends Entity
+{
+}
+
 //////// Basic joins ////////
 
 // HasOne relationship
@@ -53,7 +78,7 @@ $query->where('@author.name', 'Karel')
 	->applyQuery($fluent, $mapper);
 
 $expected = getFluent('book')
-	->leftJoin('author')->on('[book].[author_id] = [author].[id]')
+	->leftJoin('author')->on('[book].[author_id] = [author].[id_author]')
 	->where("([author].[name] = 'Karel')");
 Assert::same((string) $expected, (string) $fluent);
 
@@ -64,7 +89,7 @@ getQuery()
 	->applyQuery($fluent, $mapper);
 
 $expected = getFluent('author')
-	->leftJoin('book')->on('[author].[id] = [book].[author_id]')
+	->leftJoin('book')->on('[author].[id_author] = [book].[author_id]')
 	->where('([book].[available] = 1)');
 Assert::same((string) $expected, (string) $fluent);
 
@@ -87,8 +112,8 @@ $query->where('@reviewer.web', 'http://leanmapper.com')
 	->applyQuery($fluent, $mapper);
 
 $expected = getFluent('book')
-	->leftJoin('author')->on('[book].[author_id] = [author].[id]')
-	->leftJoin('[author] [author_reviewer_id]')->on('[book].[reviewer_id] = [author_reviewer_id].[id]')
+	->leftJoin('author')->on('[book].[author_id] = [author].[id_author]')
+	->leftJoin('[author] [author_reviewer_id]')->on('[book].[reviewer_id] = [author_reviewer_id].[id_author]')
 	->where("([author].[name] = 'Karel')")
 	->where("([author_reviewer_id].[web] = 'http://leanmapper.com')");
 Assert::same((string) $expected, (string) $fluent);
@@ -123,7 +148,7 @@ getQuery()
 	->applyQuery($fluent, $mapper);
 
 $expected = getFluent('author')
-	->leftJoin('book')->on('[author].[id] = [book].[author_id]')
+	->leftJoin('book')->on('[author].[id_author] = [book].[author_id]')
 	->where('([book].[id] = 2)');
 Assert::same((string) $expected, (string) $fluent);
 
@@ -135,13 +160,19 @@ getQuery()
 	->applyQuery($fluent, $mapper);
 
 $expected = getFluent('book')
-	->leftJoin('author')->on('[book].[author_id] = [author].[id]')
-	->leftJoin('[book] [book_id]')->on('[author].[id] = [book_id].[author_id]')
-	->leftJoin('book_tag')->on('[book_id].[id] = [book_tag].[book_id]')
+	->leftJoin('author')->on('[book].[author_id] = [author].[id_author]')
+	->leftJoin('[book] [book_id_author]')->on('[author].[id_author] = [book_id_author].[author_id]')
+	->leftJoin('book_tag')->on('[book_id_author].[id] = [book_tag].[book_id]')
 	->leftJoin('tag')->on('[book_tag].[tag_id] = [tag].[id]')
 	->where("([tag].[name] = 'foo')");
 Assert::same((string) $expected, (string) $fluent);
 
+Assert::throws(function () use ($mapper){
+	getQuery()
+		->where('@foo', 3)
+		->applyQuery(getFluent('author'), $mapper);
+}, 'LeanMapperQuery\\Exception\\InvalidStateException', "Entity 'Foo' doesn't have any field corresponding to the primary key column 'id'.");
+
 $fluent = getFluent('book');
 getQuery()
 	->where('@author', 2)