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

Merge pull request #542 from FabioBatSilva/DDC-2205

Browse Source 
[DDC-2205] Fix DDC-2205
This commit is contained in:
Guilherme Blanco 2012-12-21 03:45:07 -08:00
commit 8b5e4a9a52
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Doctrine/ORM/Query/Parser.php
View File

@ -1792,6 +1792,9 @@ class Parser
switch (true) { switch (true) {
case ($lookahead === Lexer::T_INTEGER): case ($lookahead === Lexer::T_INTEGER):
case ($lookahead === Lexer::T_FLOAT): case ($lookahead === Lexer::T_FLOAT):
// SimpleArithmeticExpression : (- u.value ) or ( + u.value ) or ( - 1 ) or ( + 1 )
case ($lookahead === Lexer::T_MINUS):
case ($lookahead === Lexer::T_PLUS):
return $this->SimpleArithmeticExpression(); return $this->SimpleArithmeticExpression();
case ($lookahead === Lexer::T_STRING): case ($lookahead === Lexer::T_STRING):

31
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View File

@ -1230,6 +1230,37 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
); );
} }
/**
* @group DDC-2205
*/
public function testCaseNegativeValuesInThenExpression()
{
$this->assertSqlGeneration(
"SELECT CASE g.name WHEN 'admin' THEN - 1 ELSE - 2 END FROM Doctrine\Tests\Models\CMS\CmsGroup g",
"SELECT CASE c0_.name WHEN 'admin' THEN -1 ELSE -2 END AS sclr0 FROM cms_groups c0_"
);
$this->assertSqlGeneration(
"SELECT CASE g.name WHEN 'admin' THEN - 2 WHEN 'guest' THEN - 1 ELSE 0 END FROM Doctrine\Tests\Models\CMS\CmsGroup g",
"SELECT CASE c0_.name WHEN 'admin' THEN -2 WHEN 'guest' THEN -1 ELSE 0 END AS sclr0 FROM cms_groups c0_"
);
$this->assertSqlGeneration(
"SELECT CASE g.name WHEN 'admin' THEN (- 1) ELSE (- 2) END FROM Doctrine\Tests\Models\CMS\CmsGroup g",
"SELECT CASE c0_.name WHEN 'admin' THEN -1 ELSE -2 END AS sclr0 FROM cms_groups c0_"
);
$this->assertSqlGeneration(
"SELECT CASE g.name WHEN 'admin' THEN ( - :value) ELSE ( + :value) END FROM Doctrine\Tests\Models\CMS\CmsGroup g",
"SELECT CASE c0_.name WHEN 'admin' THEN -? ELSE +? END AS sclr0 FROM cms_groups c0_"
);
$this->assertSqlGeneration(
"SELECT CASE g.name WHEN 'admin' THEN ( - g.id) ELSE ( + g.id) END FROM Doctrine\Tests\Models\CMS\CmsGroup g",
"SELECT CASE c0_.name WHEN 'admin' THEN -c0_.id ELSE +c0_.id END AS sclr0 FROM cms_groups c0_"
);
}
/** /**
* @group DDC-1339 * @group DDC-1339
*/ */