Skip to content

Commit

Permalink
Merge tag '2.1.12'
Browse files Browse the repository at this point in the history
Hotfix release 2.1.12

- This should fix a problem with the strict mode and the "Group By" statement from sql.
  • Loading branch information
stefanheimes committed Apr 12, 2021
2 parents 93e8458 + 91f8993 commit a176d53
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Attribute/BaseSimple.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* This file is part of MetaModels/core.
*
* (c) 2012-2019 The MetaModels team.
* (c) 2012-2021 The MetaModels team.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -18,7 +18,7 @@
* @author Sven Baumann <[email protected]>
* @author David Molineus <[email protected]>
* @author Marc Reimann <[email protected]>
* @copyright 2012-2019 The MetaModels team.
* @copyright 2012-2021 The MetaModels team.
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
* @filesource
*/
Expand Down Expand Up @@ -164,7 +164,7 @@ public function getFilterOptions($idList, $usedOnly, &$arrCount = null)
->from($this->getMetaModel()->getTableName())
->where('id IN (:ids)')
->groupBy($strCol)
->orderBy('FIELD(id, :ids)')
->orderBy('MIN(FIELD(id, :ids))')
->setParameter('ids', $idList, Connection::PARAM_STR_ARRAY)
->execute();
} else {
Expand Down

0 comments on commit a176d53

Please sign in to comment.