RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fixed issue with missing parenthesis in Math expressions

Browse Source
This commit is contained in:
guilhermeblanco 2009-08-14 21:03:27 +00:00
parent c81affb9f7
commit b0202f2921
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Doctrine/ORM/Query/Expr/Math.php
View File

@ -45,6 +45,20 @@ class Math
public function __toString() public function __toString()
{ {
return $this->_leftExpr . ' ' . $this->_operator . ' ' . $this->_rightExpr; // Adjusting Left Expression
$leftExpr = (string) $this->_leftExpr;
if ($this->_leftExpr instanceof Math) {
$leftExpr = '(' . $leftExpr . ')';
}
// Adjusting Right Expression
$rightExpr = (string) $this->_rightExpr;
if ($this->_rightExpr instanceof Math) {
$rightExpr = '(' . $rightExpr . ')';
}
return $leftExpr . ' ' . $this->_operator . ' ' . $rightExpr;
} }
} }

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

@ -130,6 +130,12 @@ class ExprTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('10 / 2', (string) Expr::quot(10, 2)); $this->assertEquals('10 / 2', (string) Expr::quot(10, 2));
} }
public function testScopeInArithmeticExpr()
{
$this->assertEquals('(100 - 20) / 2', (string) Expr::quot(Expr::diff(100, 20), 2));
$this->assertEquals('100 - (20 / 2)', (string) Expr::diff(100, Expr::quot(20, 2)));
}
public function testSquareRootExpr() public function testSquareRootExpr()
{ {
$this->assertEquals('SQRT(1)', (string) Expr::sqrt(1)); $this->assertEquals('SQRT(1)', (string) Expr::sqrt(1));