RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 14:43:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:doctrine/doctrine2

Browse Source
This commit is contained in:
Jonathan H. Wage 2010-05-25 18:11:52 -04:00
commit b9965bfb1c
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -5,5 +5,5 @@ reports/
dist/ dist/
download/ download/
lib/api/ lib/api/
lib/Doctrine/Common/ lib/Doctrine/Common
lib/Doctrine/DBAL/ lib/Doctrine/DBAL

8
lib/Doctrine/ORM/Query/Expr.php
View File

@ -470,9 +470,13 @@ class Expr
* @param integer $len Length of crop. May accept negative values. * @param integer $len Length of crop. May accept negative values.
* @return Expr\Func * @return Expr\Func
*/ */
public function substring($x, $from, $len) public function substring($x, $from, $len = null)
{ {
return new Expr\Func('SUBSTRING', array($x, $from, $len)); $args = array($x, $from);
if (null !== $len) {
$args[] = $len;
}
return new Expr\Func('SUBSTRING', $args);
} }
/** /**

9
tests/Doctrine/Tests/ORM/Query/ExprTest.php
View File

@ -185,6 +185,15 @@ class ExprTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('SUBSTRING(a.title, 0, 25)', (string) $this->_expr->substring('a.title', 0, 25)); $this->assertEquals('SUBSTRING(a.title, 0, 25)', (string) $this->_expr->substring('a.title', 0, 25));
} }
/**
* @group regression
* @group DDC-612
*/
public function testSubstringExprAcceptsTwoArguments()
{
$this->assertEquals('SUBSTRING(a.title, 0)', (string) $this->_expr->substring('a.title', 5));
}
public function testLowerExpr() public function testLowerExpr()
{ {
$this->assertEquals('LOWER(u.first_name)', (string) $this->_expr->lower('u.first_name')); $this->assertEquals('LOWER(u.first_name)', (string) $this->_expr->lower('u.first_name'));