Skip to content

Commit

Permalink
Fix order by
Browse files Browse the repository at this point in the history
Fix order by part of the query in many to one relationships
  • Loading branch information
Marc TEYSSIER committed Sep 22, 2016
1 parent a3bd8bf commit 0565a2a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/Mouf/Database/TDBM/AbstractTDBMObject.php
Expand Up @@ -496,18 +496,19 @@ private function removeManyToOneRelationship(string $tableName, string $foreignK
* @param string $foreignKeyName
* @param string $searchTableName
* @param array $searchFilter
* @param string $orderString The ORDER BY part of the query. All columns must be prefixed by the table name (in the form: table.column). WARNING : This parameter is not kept when there is an additionnal or removal object !
*
* @return AlterableResultIterator
*/
protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter) : AlterableResultIterator
protected function retrieveManyToOneRelationshipsStorage(string $tableName, string $foreignKeyName, string $searchTableName, array $searchFilter, $orderString = null) : AlterableResultIterator
{
$key = $tableName.'___'.$foreignKeyName;
$alterableResultIterator = $this->getManyToOneAlterableResultIterator($tableName, $foreignKeyName);
if ($this->status === TDBMObjectStateEnum::STATE_DETACHED || $this->status === TDBMObjectStateEnum::STATE_NEW || (isset($this->manyToOneRelationships[$key]) && $this->manyToOneRelationships[$key]->getUnderlyingResultIterator() !== null)) {
return $alterableResultIterator;
}

$unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter);
$unalteredResultIterator = $this->tdbmService->findObjects($searchTableName, $searchFilter, [], $orderString);

$alterableResultIterator->setResultIterator($unalteredResultIterator->getIterator());

Expand Down

0 comments on commit 0565a2a

Please sign in to comment.