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

MINOR Tidy up of SQLQuery constructor docs and default args, limit is

Browse Source 
stored internally as an array, not a string.
This commit is contained in:
Sean Harvey 2012-05-07 17:07:30 +12:00
parent bb9ffd2eb1
commit 3bc1da0543
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
model/SQLQuery.php
View File

@ -60,7 +60,7 @@ class SQLQuery {
* *
* @var string * @var string
*/ */
protected $limit; protected $limit = array();
/** /**
* If this is true DISTINCT will be added to the SQL. * If this is true DISTINCT will be added to the SQL.
@ -98,22 +98,18 @@ class SQLQuery {
/** /**
* Construct a new SQLQuery. * Construct a new SQLQuery.
* *
* @param array $select An array of fields to select. * @param array $select An array of SELECT fields.
* @param array $from An array of join clauses. The first one should be just the table name. * @param array $from An array of FROM clauses. The first one should be just the table name.
* @param array $where An array of filters, to be inserted into the WHERE clause. * @param array $where An array of WHERE clauses.
* @param string $orderby An ORDER BY clause. * @param array $orderby An array ORDER BY clause.
* @param array $groupby An array of fields to group by. * @param array $groupby An array of GROUP BY clauses.
* @param array $having An array of having clauses. * @param array $having An array of HAVING clauses.
* @param string $limit A LIMIT clause. * @param array|string $limit A LIMIT clause or array with limit and offset keys
*
* TODO: perhaps we can quote things here instead of requiring all the parameters to be quoted
* by this stage.
*/ */
function __construct($select = "*", $from = array(), $where = "", $orderby = "", $groupby = "", $having = "", $limit = "") { function __construct($select = "*", $from = array(), $where = array(), $orderby = array(), $groupby = array(), $having = array(), $limit = array()) {
$this->setSelect($select); $this->setSelect($select);
// @todo $this->setFrom($from);
$this->from = is_array($from) ? $from : array(str_replace(array('"','`'),'',$from) => $from);
$this->setWhere($where); $this->setWhere($where);
$this->setOrderBy($orderby); $this->setOrderBy($orderby);
$this->setGroupBy($groupby); $this->setGroupBy($groupby);
@ -417,8 +413,8 @@ class SQLQuery {
} }
/** /**
* Get limit clause * Get the limit property.
* @return string * @return array
*/ */
public function getLimit() { public function getLimit() {
return $this->limit; return $this->limit;
@ -438,17 +434,16 @@ class SQLQuery {
'limit' => $limit, 'limit' => $limit,
); );
} else if($limit && is_string($limit)) { } else if($limit && is_string($limit)) {
if(strpos($limit,',') !== false) list($start, $innerLimit) = explode(',', $limit, 2); if(strpos($limit, ',') !== false) list($start, $innerLimit) = explode(',', $limit, 2);
else list($innerLimit, $start) = explode(' OFFSET ', strtoupper($limit), 2); else list($innerLimit, $start) = explode(' OFFSET ', strtoupper($limit), 2);
$this->limit = array( $this->limit = array(
'start' => trim($start), 'start' => trim($start),
'limit' => trim($innerLimit), 'limit' => trim($innerLimit),
); );
} else { } else {
$this->limit = $limit; $this->limit = $limit;
} }
return $this; return $this;
} }