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

Merge pull request #2067 from chillu/pulls/sqlquery-zero-limit

Browse Source 
BUG Accept $limit=0 in SQLQuery->setLimit()
This commit is contained in:
Sean Harvey 2013-06-06 13:52:37 -07:00
commit c14b7997d6
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
model/SQLQuery.php
View File

@ -450,6 +450,7 @@ class SQLQuery {
* Internally, limit will always be stored as a map containing the keys 'start' and 'limit' * Internally, limit will always be stored as a map containing the keys 'start' and 'limit'
* *
* @param int|string|array $limit If passed as a string or array, assumes SQL escaped data. * @param int|string|array $limit If passed as a string or array, assumes SQL escaped data.
* Only applies for positive values, or if an $offset is set as well.
* @param int $offset * @param int $offset
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
@ -461,7 +462,7 @@ class SQLQuery {
throw new InvalidArgumentException("SQLQuery::setLimit() only takes positive values"); throw new InvalidArgumentException("SQLQuery::setLimit() only takes positive values");
} }
if($limit && is_numeric($limit)) { if(is_numeric($limit) && ($limit || $offset)) {
$this->limit = array( $this->limit = array(
'start' => $offset, 'start' => $offset,
'limit' => $limit, 'limit' => $limit,

33
tests/model/SQLQueryTest.php
View File

@ -138,6 +138,39 @@ class SQLQueryTest extends SapphireTest {
$query->sql()); $query->sql());
} }
public function testNullLimit() {
$query = new SQLQuery();
$query->setFrom("MyTable");
$query->setLimit(null);
$this->assertEquals(
'SELECT * FROM MyTable',
$query->sql()
);
}
public function testZeroLimit() {
$query = new SQLQuery();
$query->setFrom("MyTable");
$query->setLimit(0);
$this->assertEquals(
'SELECT * FROM MyTable',
$query->sql()
);
}
public function testZeroLimitWithOffset() {
$query = new SQLQuery();
$query->setFrom("MyTable");
$query->setLimit(0, 99);
$this->assertEquals(
'SELECT * FROM MyTable LIMIT 0 OFFSET 99',
$query->sql()
);
}
/** /**
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
*/ */