Entity: Fix hasMany & ORDER BY, requires LM >=2.3 (BC break)

Author: janpecha

LeanMapperQuery/Entity.php

@@ -59,11 +59,29 @@ protected function queryProperty($field, IQuery $query)
 			$sourceReferencingColumn = $relationship->getColumnReferencingSourceTable();
 			$targetReferencingColumn = $relationship->getColumnReferencingTargetTable();
 			$targetTable = $relationship->getTargetTable();
+			$targetPrimaryKey = $mapper->getPrimaryKey($targetTable);
 			$rows = array();
+			$resultRows = array();
+			$targetResultProxy = NULL;
+
 			foreach ($this->row->referencing($relationshipTable, $sourceReferencingColumn) as $relationship) {
 				$row = $relationship->referenced($targetTable, $targetReferencingColumn, new Filtering($filters));
-				$row !== NULL && $rows[] = $row;
+				if ($row !== NULL && $targetResultProxy === NULL) {
+					$targetResultProxy = $row->getResultProxy();
+				}
+				$row !== NULL && $resultRows[$row->{$targetPrimaryKey}] = $row;
+			}
+
+			if ($targetResultProxy) {
+				foreach ($targetResultProxy as $rowId => $rowData) {
+					if (isset($resultRows[$rowId])) {
+						$rows[] = $resultRows[$rowId];
+					}
+				}
+			} else {
+				$rows = $resultRows;
 			}
+
 		} else {
 			throw new InvalidRelationshipException('Only BelongsToMany and HasMany relationships are supported when querying entity property. ' . get_class($relationship) . ' given.');
 		}

composer.json

@@ -15,7 +15,7 @@
 	},
 	"require": {
 		"php": ">=5.3.0",
-		"tharos/leanmapper": ">=2.1"
+		"tharos/leanmapper": ">=2.3"
 	},
 	"require-dev": {
 		"nette/tester": "~1.2"

tests/LeanMapperQuery/Query.orderBy.hasMany.phpt

@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * Test: LeanMapperQuery\Query ordering methods.
+ * @author Michal Bohuslávek
+ */
+
+use LeanMapper\Repository;
+use LeanMapperQuery\Entity;
+use LeanMapperQuery\Query;
+use Tester\Assert;
+
+require_once __DIR__ . '/../bootstrap.php';
+
+/**
+ * @property int   $id
+ * @property Tag[] $tags m:hasMany
+ */
+class Book extends Entity
+{
+	public function queryTags(Query $query)
+	{
+		return $this->queryProperty('tags', $query);
+	}
+}
+
+/**
+ * @property int    $id
+ * @property string $name
+ */
+class Tag extends Entity
+{
+}
+
+class BookRepository extends Repository
+{
+	public function get($id)
+	{
+		$row = $this->connection->select('*')
+			->from($this->getTable())
+			->where('%n = ?', $this->mapper->getPrimaryKey($this->getTable()), $id)
+			->fetch();
+		if ($row === FALSE) {
+			return $row;
+		}
+		return $this->createEntity($row);
+	}
+}
+
+$bookRepository = new BookRepository($connection, $mapper, $entityFactory);
+$book = $bookRepository->get(1);
+
+$query = getQuery()
+	->orderBy('@name');
+
+$tags = $book->queryTags($query);
+$names = array();
+
+foreach ($tags as $tag) {
+	$names[] = $tag->name;
+}
+
+Assert::same(array('ebook', 'popular'), $names);