RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-43] Fixing order of limit and offset

Browse source
This commit is contained in:
jwage 2009-10-12 19:10:41 +00:00
parent 7ec25f196a
commit f3f522b7f3
5 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/Doctrine/DBAL/Platforms/AbstractPlatform.php
View file

@ -1149,33 +1149,6 @@ abstract class AbstractPlatform
return false; return false;
} }
/**
* Adds a LIMIT/OFFSET clause to the query.
* This default implementation writes the syntax "LIMIT x OFFSET y" to the
* query which is supported by MySql, PostgreSql and Sqlite.
* Any database platforms that do not support this syntax should override
* this implementation and provide their own.
*
* @param string $query The SQL string to write to / append to.
* @param mixed $limit
* @param mixed $offset
*/
public function writeLimitClause($query, $limit = false, $offset = false)
{
$limit = (int) $limit;
$offset = (int) $offset;
if ($limit && $offset) {
$query .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
} elseif ($limit && ! $offset) {
$query .= ' LIMIT ' . $limit;
} elseif ( ! $limit && $offset) {
$query .= ' LIMIT 999999999999 OFFSET ' . $offset;
}
return $query;
}
/** /**
* Some platforms need the boolean values to be converted. * Some platforms need the boolean values to be converted.
* Default conversion defined here converts to integers. * Default conversion defined here converts to integers.
@ -1534,14 +1507,14 @@ abstract class AbstractPlatform
public function modifyLimitQuery($query, $limit, $offset = null) public function modifyLimitQuery($query, $limit, $offset = null)
{ {
if ( ! is_null($offset)) {
$query .= ' OFFSET ' . $offset;
}
if ( ! is_null($limit)) { if ( ! is_null($limit)) {
$query .= ' LIMIT ' . $limit; $query .= ' LIMIT ' . $limit;
} }
if ( ! is_null($offset)) {
$query .= ' OFFSET ' . $offset;
}
return $query; return $query;
} }

2
tests/Doctrine/Tests/DBAL/Platforms/MySqlPlatformTest.php
View file

@ -186,7 +186,7 @@ class MySqlPlatformTest extends \Doctrine\Tests\DbalTestCase
public function testModifyLimitQuery() public function testModifyLimitQuery()
{ {
$sql = $this->_platform->modifyLimitQuery('SELECT * FROM user', 10, 0); $sql = $this->_platform->modifyLimitQuery('SELECT * FROM user', 10, 0);
$this->assertEquals('SELECT * FROM user OFFSET 0 LIMIT 10', $sql); $this->assertEquals('SELECT * FROM user LIMIT 10 OFFSET 0', $sql);
} }
public function testModifyLimitQueryWithEmptyOffset() public function testModifyLimitQueryWithEmptyOffset()

2
tests/Doctrine/Tests/DBAL/Platforms/PostgreSqlPlatformTest.php
View file

@ -212,7 +212,7 @@ class PostgreSqlPlatformTest extends \Doctrine\Tests\DbalTestCase
public function testModifyLimitQuery() public function testModifyLimitQuery()
{ {
$sql = $this->_platform->modifyLimitQuery('SELECT * FROM user', 10, 0); $sql = $this->_platform->modifyLimitQuery('SELECT * FROM user', 10, 0);
$this->assertEquals('SELECT * FROM user OFFSET 0 LIMIT 10', $sql); $this->assertEquals('SELECT * FROM user LIMIT 10 OFFSET 0', $sql);
} }
public function testModifyLimitQueryWithEmptyOffset() public function testModifyLimitQueryWithEmptyOffset()

2
tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
View file

@ -114,7 +114,7 @@ class SqlitePlatformTest extends \Doctrine\Tests\DbalTestCase
public function testModifyLimitQuery() public function testModifyLimitQuery()
{ {
$sql = $this->_platform->modifyLimitQuery('SELECT * FROM user', 10, 0); $sql = $this->_platform->modifyLimitQuery('SELECT * FROM user', 10, 0);
$this->assertEquals('SELECT * FROM user OFFSET 0 LIMIT 10', $sql); $this->assertEquals('SELECT * FROM user LIMIT 10 OFFSET 0', $sql);
} }
public function testModifyLimitQueryWithEmptyOffset() public function testModifyLimitQueryWithEmptyOffset()

2
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View file

@ -361,7 +361,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
->setMaxResults(10) ->setMaxResults(10)
->setFirstResult(0); ->setFirstResult(0);
$this->assertEquals('SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ OFFSET 0 LIMIT 10', $q->getSql()); $this->assertEquals('SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ LIMIT 10 OFFSET 0', $q->getSql());
} }
public function testSizeFunction() public function testSizeFunction()