Merge pull request #727 from nextras/ordering-has-many

Fix ordering

docs/collection-functions.md

@@ -125,7 +125,7 @@ return new DbalExpressionResult('SUBSTRING(%ex, 0, %i) = %s', [$expression->args
 
 The implementation is different to Dbal's interface, because the filtering happens directly in PHP runtime. The method takes `ArrayCollectionHelper` instance for easier expression processing, `IEntity` instance to check if the expressions requires it (not) to be filtered out, and user input/function parameters.
 
-Array collection function returns `ArrayExpressionResult` instance wrapping a mixed value, the kind (type) of the wrapped value depends on which context it will be user or evaluated later. Ultimately, the value will be interpreted as a boolean to indicate if the entity should be filtered out in the `ICollection::findBy()` call; alternatively, the value will be used for comparison (`<=>`) of two entities when used for `ICollection::oderBy()` call.
+Array collection function returns `ArrayExpressionResult` instance wrapping a mixed value, the kind (type) of the wrapped value depends on which context it will be user or evaluated later. Ultimately, the value will be interpreted as a boolean to indicate if the entity should be filtered out in the `ICollection::findBy()` call; alternatively, the value will be used for comparison (`<=>`) of two entities when used for `ICollection::orderBy()` call.
 
 Let's see an example: a "Like" collection function; We want to compare a property expression to the passed user-input value using a prefix comparison.
 

src/Collection/DbalCollection.php

@@ -125,6 +125,7 @@ public function orderBy($expression, string $direction = ICollection::ASC): ICol
 	public function resetOrderBy(): ICollection
 	{
 		$collection = clone $this;
+		$collection->ordering = [];
 		$collection->getQueryBuilder()->orderBy(null);
 		return $collection;
 	}

tests/cases/integration/Collection/collection.phpt

@@ -175,6 +175,19 @@ class CollectionTest extends DataTestCase
 	}
 
 
+	public function testOrderingReset(): void
+	{
+		$books = $this->orm->books->findAll()
+			->orderBy('author->name')
+			->resetOrderBy()
+			->orderBy('author->name', ICollection::DESC)
+			->orderBy('id', ICollection::DESC)
+			->fetchPairs(null, 'id');
+
+		Assert::same([4, 3, 2, 1], $books);
+	}
+
+
 	public function testEmptyArray(): void
 	{
 		$books = $this->orm->books->findBy(['id' => []]);

tests/sqls/NextrasTests/Orm/Integration/Collection/CollectionTest_testOrderingReset.sql

@@ -0,0 +1,10 @@
+SELECT
+  "books".*
+FROM
+  "books" AS "books"
+  LEFT JOIN "public"."authors" AS "author" ON (
+    "books"."author_id" = "author"."id"
+  )
+ORDER BY
+  "author"."name" DESC,
+  "books"."id" DESC;