tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns

Browse Source
This commit is contained in:
Shawn 2017-01-18 15:03:44 +13:00
parent 20e486690c
commit 72b6fb49b6
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/queries/SQLSelect.php
View File

@ -334,10 +334,12 @@ class SQLSelect extends SQLConditionalExpression {
// Move the clause to the select fragment, substituting a placeholder column in the sort fragment. // Move the clause to the select fragment, substituting a placeholder column in the sort fragment.
$clause = trim($clause); $clause = trim($clause);
$column = "_SortColumn{$i}"; do {
$column = "_SortColumn{$i}";
$i++;
} while(array_key_exists('"' . $column . '"', $this->orderby));
$this->selectField($clause, $column); $this->selectField($clause, $column);
$clause = '"' . $column . '"'; $clause = '"' . $column . '"';
$i++;
} }
$orderby[$clause] = $dir; $orderby[$clause] = $dir;
} }

12
tests/model/SQLQueryTest.php
View File

@ -125,6 +125,18 @@ class SQLQueryTest extends SapphireTest {
$this->assertTrue($query->canSortBy('Name')); $this->assertTrue($query->canSortBy('Name'));
} }
/**
* Test multiple order by SQL clauses.
*/
public function testAddOrderBy() {
$query = new SQLQuery();
$query->setSelect('ID', "Title")->setFrom('Page')->addOrderBy('(ID % 2) = 0', 'ASC')->addOrderBy('ID > 50', 'ASC');
$this->assertSQLEquals(
'SELECT ID, Title, (ID % 2) = 0 AS "_SortColumn0", ID > 50 AS "_SortColumn1" FROM Page ORDER BY "_SortColumn0" ASC, "_SortColumn1" ASC',
$query->sql($parameters)
);
}
public function testSelectWithChainedFilterParameters() { public function testSelectWithChainedFilterParameters() {
$query = new SQLQuery(); $query = new SQLQuery();
$query->setSelect(array("Name","Meta"))->setFrom("MyTable"); $query->setSelect(array("Name","Meta"))->setFrom("MyTable");