tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-30 17:24:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

AbstractQuery implements QueryInterface, added addColumn, fixed sort

Browse Source
This commit is contained in:
Thomas Gelf 2013-08-20 23:17:43 +02:00 committed by Eric Lippmann
parent 86945152b4
commit 1eb0fcdff8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Data/AbstractQuery.php
View File

@ -4,7 +4,7 @@ namespace Icinga\Data;
use Icinga\Exception; use Icinga\Exception;
abstract class AbstractQuery abstract class AbstractQuery implements QueryInterface
{ {
/** /**
* Sort ascending * Sort ascending
@ -72,6 +72,17 @@ abstract class AbstractQuery
$this->init(); $this->init();
} }
public function addColumn($name, $alias = null)
{
// TODO: Fail if adding column twice, but allow same col with new alias
if ($alias === null) {
$this->columns[] = $name;
} else {
$this->columns[$alias] = $name;
}
return $this;
}
public function getDatasource() public function getDatasource()
{ {
return $this->ds; return $this->ds;
@ -158,7 +169,7 @@ abstract class AbstractQuery
$col = substr($col, 0, $pos); $col = substr($col, 0, $pos);
} }
} else { } else {
if (strtoupper($dir) === 'DESC') { if ($dir === self::SORT_DESC || strtoupper($dir) === 'DESC') {
$dir = self::SORT_DESC; $dir = self::SORT_DESC;
} else { } else {
$dir = self::SORT_ASC; $dir = self::SORT_ASC;