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

BUGFIX Fixing SortColumn alias to be recognised by MSSQL/PGSQL

Browse Source
This commit is contained in:
Sean Harvey 2012-05-03 12:02:21 +12:00
parent 521d436b45
commit 37369abf1d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
model/DataQuery.php
View File

@ -240,16 +240,16 @@ class DataQuery {
// don't touch functions in the ORDER BY or function calls // don't touch functions in the ORDER BY or function calls
// selected as fields // selected as fields
if(strpos($k, '(') !== false) continue; if(strpos($k, '(') !== false) continue;
// Pull through SortColumn references from the originalSelect variables
if(preg_match('/_SortColumn/', $k)) {
if(isset($originalSelect[$k])) $query->selectField($originalSelect[$k], $k);
continue;
}
$col = str_replace('"', '', trim($k)); $col = str_replace('"', '', trim($k));
$parts = explode('.', $col); $parts = explode('.', $col);
// Pull through SortColumn references from the originalSelect variables
if(preg_match('/_SortColumn/', $col)) {
if(isset($originalSelect[$col])) $query->selectField($originalSelect[$col], $col);
continue;
}
if(count($parts) == 1) { if(count($parts) == 1) {
$databaseFields = DataObject::database_fields($baseClass); $databaseFields = DataObject::database_fields($baseClass);

4
model/SQLQuery.php
View File

@ -383,9 +383,9 @@ class SQLQuery {
$clause = trim($clause); $clause = trim($clause);
$column = "_SortColumn{$i}"; $column = "_SortColumn{$i}";
$this->selectField($clause, $column); $this->selectField($clause, $column);
$this->orderby($column, $dir, false); $this->orderby('"' . $column . '"', $dir, false);
$i++; $i++;
} }
} }