Merge pull request #618 from FabioBatSilva/DDC-2188

[DDC-2188] Fix arithmetic priority

lib/Doctrine/ORM/Query/AST/ParenthesisExpression.php

@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Query\AST;
+
+/**
+ * ParenthesisExpression ::= "(" ArithmeticPrimary ")"
+ *
+ * @author Fabio B. Silva <fabio.bat.silva@gmail.com>
+ * @since 2.4
+ */
+class ParenthesisExpression extends Node
+{
+ /**
+ * @var \Doctrine\ORM\Query\AST\Node
+ */
+ public $expression;
+
+ /**
+ * @param \Doctrine\ORM\Query\AST\Node $expression
+ */
+ public function __construct(Node $expression)
+ {
+ $this->expression = $expression;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function dispatch($walker)
+ {
+ return $walker->walkParenthesisExpression($this);
+ }
+}

lib/Doctrine/ORM/Query/Parser.php

@@ -2704,7 +2704,7 @@ public function ArithmeticFactor()
  }
 
  /**
- * ArithmeticPrimary ::= SingleValuedPathExpression | Literal | "(" SimpleArithmeticExpression ")"
+ * ArithmeticPrimary ::= SingleValuedPathExpression | Literal | ParenthesisExpression
  * | FunctionsReturningNumerics | AggregateExpression | FunctionsReturningStrings
  * | FunctionsReturningDatetime | IdentificationVariable | ResultVariable
  * | InputParameter | CaseExpression
@@ -2713,11 +2713,12 @@ public function ArithmeticPrimary()
  {
  if ($this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
  $this->match(Lexer::T_OPEN_PARENTHESIS);
+
  $expr = $this->SimpleArithmeticExpression();
 
  $this->match(Lexer::T_CLOSE_PARENTHESIS);
 
- return $expr;
+ return new AST\ParenthesisExpression($expr);
  }
 
  switch ($this->lexer->lookahead['type']) {

lib/Doctrine/ORM/Query/SqlWalker.php

@@ -1216,6 +1216,7 @@ public function walkSelectExpression($selectExpression)
  case ($expr instanceof AST\SimpleArithmeticExpression):
  case ($expr instanceof AST\ArithmeticTerm):
  case ($expr instanceof AST\ArithmeticFactor):
+ case ($expr instanceof AST\ParenthesisExpression):
  case ($expr instanceof AST\Literal):
  case ($expr instanceof AST\NullIfExpression):
  case ($expr instanceof AST\CoalesceExpression):
@@ -1409,6 +1410,16 @@ public function walkSimpleSelectClause($simpleSelectClause)
  . $this->walkSimpleSelectExpression($simpleSelectClause->simpleSelectExpression);
  }
 
+ /**
+ * @param \Doctrine\ORM\Query\AST\ParenthesisExpression $parenthesisExpression
+ *
+ * @return string.
+ */
+ public function walkParenthesisExpression(AST\ParenthesisExpression $parenthesisExpression)
+ {
+ return sprintf('(%s)', $parenthesisExpression->expression->dispatch($this));
+ }
+
  /**
  * @param AST\NewObjectExpression $newObjectExpression
  *

tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php

@@ -318,7 +318,7 @@ public function testSupportsArithmeticExpressionsInWherePart()
  {
  $this->assertSqlGeneration(
  'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE ((u.id + 5000) * u.id + 3) < 10000000',
- 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE (c0_.id + 5000) * c0_.id + 3 < 10000000'
+ 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE ((c0_.id + 5000) * c0_.id + 3) < 10000000'
  );
  }
 
@@ -763,15 +763,15 @@ public function testNestedExpressions()
  {
  $this->assertSqlGeneration(
  "select u from Doctrine\Tests\Models\CMS\CmsUser u where u.id > 10 and u.id < 42 and ((u.id * 2) > 5)",
- "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.id > 10 AND c0_.id < 42 AND (c0_.id * 2 > 5)"
+ "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE c0_.id > 10 AND c0_.id < 42 AND ((c0_.id * 2) > 5)"
  );
  }
 
  public function testNestedExpressions2()
  {
  $this->assertSqlGeneration(
  "select u from Doctrine\Tests\Models\CMS\CmsUser u where (u.id > 10) and (u.id < 42 and ((u.id * 2) > 5)) or u.id <> 42",
- "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE (c0_.id > 10) AND (c0_.id < 42 AND (c0_.id * 2 > 5)) OR c0_.id <> 42"
+ "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE (c0_.id > 10) AND (c0_.id < 42 AND ((c0_.id * 2) > 5)) OR c0_.id <> 42"
  );
  }
 
@@ -1167,15 +1167,15 @@ public function testGeneralCaseWithSingleWhenClause()
  {
  $this->assertSqlGeneration(
  "SELECT g.id, CASE WHEN ((g.id / 2) > 18) THEN 1 ELSE 0 END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g",
- "SELECT c0_.id AS id0, CASE WHEN (c0_.id / 2 > 18) THEN 1 ELSE 0 END AS sclr1 FROM cms_groups c0_"
+ "SELECT c0_.id AS id0, CASE WHEN ((c0_.id / 2) > 18) THEN 1 ELSE 0 END AS sclr1 FROM cms_groups c0_"
  );
  }
 
  public function testGeneralCaseWithMultipleWhenClause()
  {
  $this->assertSqlGeneration(
  "SELECT g.id, CASE WHEN (g.id / 2 < 10) THEN 2 WHEN ((g.id / 2) > 20) THEN 1 ELSE 0 END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g",
- "SELECT c0_.id AS id0, CASE WHEN (c0_.id / 2 < 10) THEN 2 WHEN (c0_.id / 2 > 20) THEN 1 ELSE 0 END AS sclr1 FROM cms_groups c0_"
+ "SELECT c0_.id AS id0, CASE WHEN (c0_.id / 2 < 10) THEN 2 WHEN ((c0_.id / 2) > 20) THEN 1 ELSE 0 END AS sclr1 FROM cms_groups c0_"
  );
  }
 
@@ -1191,23 +1191,23 @@ public function testSimpleCaseWithMultipleWhenClause()
  {
  $this->assertSqlGeneration(
  "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id = (CASE g.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END)",
- "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id = CASE c0_.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END"
+ "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id = (CASE c0_.name WHEN 'admin' THEN 1 WHEN 'moderator' THEN 2 ELSE 3 END)"
  );
  }
 
  public function testGeneralCaseWithSingleWhenClauseInSubselect()
  {
  $this->assertSqlGeneration(
  "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE WHEN ((g2.id / 2) > 18) THEN 2 ELSE 1 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)",
- "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE WHEN (c1_.id / 2 > 18) THEN 2 ELSE 1 END AS sclr2 FROM cms_groups c1_)"
+ "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE WHEN ((c1_.id / 2) > 18) THEN 2 ELSE 1 END AS sclr2 FROM cms_groups c1_)"
  );
  }
 
  public function testGeneralCaseWithMultipleWhenClauseInSubselect()
  {
  $this->assertSqlGeneration(
  "SELECT g FROM Doctrine\Tests\Models\CMS\CmsGroup g WHERE g.id IN (SELECT CASE WHEN (g.id / 2 < 10) THEN 3 WHEN ((g.id / 2) > 20) THEN 2 ELSE 1 END FROM Doctrine\Tests\Models\CMS\CmsGroup g2)",
- "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE WHEN (c0_.id / 2 < 10) THEN 3 WHEN (c0_.id / 2 > 20) THEN 2 ELSE 1 END AS sclr2 FROM cms_groups c1_)"
+ "SELECT c0_.id AS id0, c0_.name AS name1 FROM cms_groups c0_ WHERE c0_.id IN (SELECT CASE WHEN (c0_.id / 2 < 10) THEN 3 WHEN ((c0_.id / 2) > 20) THEN 2 ELSE 1 END AS sclr2 FROM cms_groups c1_)"
  );
  }
 
@@ -1234,7 +1234,7 @@ public function testSimpleCaseWithStringPrimary()
  {
  $this->assertSqlGeneration(
  "SELECT g.id, CASE WHEN ((g.id / 2) > 18) THEN 'Foo' ELSE 'Bar' END AS test FROM Doctrine\Tests\Models\CMS\CmsGroup g",
- "SELECT c0_.id AS id0, CASE WHEN (c0_.id / 2 > 18) THEN 'Foo' ELSE 'Bar' END AS sclr1 FROM cms_groups c0_"
+ "SELECT c0_.id AS id0, CASE WHEN ((c0_.id / 2) > 18) THEN 'Foo' ELSE 'Bar' END AS sclr1 FROM cms_groups c0_"
  );
  }
 
@@ -1255,17 +1255,17 @@ 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_"
+ "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_"
+ "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_"
+ "SELECT CASE c0_.name WHEN 'admin' THEN (-c0_.id) ELSE (+c0_.id) END AS sclr0 FROM cms_groups c0_"
  );
  }
 
@@ -1587,7 +1587,7 @@ public function testParenthesesOnTheLeftHandOfComparison()
  {
  $this->assertSqlGeneration(
  'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u where ( (u.id + u.id) * u.id ) > 100',
- 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE (c0_.id + c0_.id) * c0_.id > 100'
+ 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ WHERE ((c0_.id + c0_.id) * c0_.id) > 100'
  );
  $this->assertSqlGeneration(
  'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u where (u.id + u.id) * u.id > 100',
@@ -1781,11 +1781,11 @@ public function testOrderByClauseSupportsSimpleArithmeticExpression()
  );
  $this->assertSqlGeneration(
  'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY ( ( (u.id + 1) * (u.id - 1) ) / 2)',
- 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ ORDER BY (c0_.id + 1) * (c0_.id - 1) / 2 ASC'
+ 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ ORDER BY (((c0_.id + 1) * (c0_.id - 1)) / 2) ASC'
  );
  $this->assertSqlGeneration(
  'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u ORDER BY ((u.id + 5000) * u.id + 3) ',
- 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ ORDER BY (c0_.id + 5000) * c0_.id + 3 ASC'
+ 'SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3 FROM cms_users c0_ ORDER BY ((c0_.id + 5000) * c0_.id + 3) ASC'
  );
  }
 
@@ -1863,7 +1863,7 @@ public function testCaseThenParameterArithmeticExpression()
 
  $this->assertSqlGeneration(
  'SELECT SUM(CASE WHEN e.salary <= :value THEN (e.salary - :value) WHEN e.salary >= :value THEN (:value - e.salary) ELSE (e.salary + :value) END) FROM Doctrine\Tests\Models\Company\CompanyEmployee e',
- 'SELECT SUM(CASE WHEN c0_.salary <= ? THEN c0_.salary - ? WHEN c0_.salary >= ? THEN ? - c0_.salary ELSE c0_.salary + ? END) AS sclr0 FROM company_employees c0_ INNER JOIN company_persons c1_ ON c0_.id = c1_.id'
+ 'SELECT SUM(CASE WHEN c0_.salary <= ? THEN (c0_.salary - ?) WHEN c0_.salary >= ? THEN (? - c0_.salary) ELSE (c0_.salary + ?) END) AS sclr0 FROM company_employees c0_ INNER JOIN company_persons c1_ ON c0_.id = c1_.id'
  );
  }
 
@@ -1887,49 +1887,69 @@ public function testCaseThenFunction()
  'SELECT CASE WHEN LENGTH(c0_.name) > ? THEN SUBSTRING(c0_.name FROM 0 FOR ?) ELSE TRIM(c0_.name) END AS sclr0 FROM cms_users c0_'
  );
  }
- 
- /**
- * @group DDC-2268
+
+ /**
+ * @group DDC-2268
  */
+ public function testSupportsMoreThanTwoParametersInConcatFunction()
+ {
+ $connMock = $this->_em->getConnection();
+ $orgPlatform = $connMock->getDatabasePlatform();
 
- public function testSupportsMoreThanTwoParametersInConcatFunction()
- {
- $connMock = $this->_em->getConnection();
- $orgPlatform = $connMock->getDatabasePlatform();
-
- $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform);
- $this->assertSqlGeneration(
- "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1",
- "SELECT c0_.id AS id0 FROM cms_users c0_ WHERE CONCAT(c0_.name, c0_.status, 's') = ?"
- );
- $this->assertSqlGeneration(
- "SELECT CONCAT(u.id, u.name, u.status) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1",
- "SELECT CONCAT(c0_.id, c0_.name, c0_.status) AS sclr0 FROM cms_users c0_ WHERE c0_.id = ?"
- );
-
- $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\PostgreSqlPlatform);
- $this->assertSqlGeneration(
- "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1",
- "SELECT c0_.id AS id0 FROM cms_users c0_ WHERE c0_.name || c0_.status || 's' = ?"
- );
- $this->assertSqlGeneration(
- "SELECT CONCAT(u.id, u.name, u.status) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1",
- "SELECT c0_.id || c0_.name || c0_.status AS sclr0 FROM cms_users c0_ WHERE c0_.id = ?"
+ $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\MySqlPlatform);
+ $this->assertSqlGeneration(
+ "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1",
+ "SELECT c0_.id AS id0 FROM cms_users c0_ WHERE CONCAT(c0_.name, c0_.status, 's') = ?"
+ );
+ $this->assertSqlGeneration(
+ "SELECT CONCAT(u.id, u.name, u.status) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1",
+ "SELECT CONCAT(c0_.id, c0_.name, c0_.status) AS sclr0 FROM cms_users c0_ WHERE c0_.id = ?"
+ );
+
+ $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\PostgreSqlPlatform);
+ $this->assertSqlGeneration(
+ "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1",
+ "SELECT c0_.id AS id0 FROM cms_users c0_ WHERE c0_.name || c0_.status || 's' = ?"
+ );
+ $this->assertSqlGeneration(
+ "SELECT CONCAT(u.id, u.name, u.status) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1",
+ "SELECT c0_.id || c0_.name || c0_.status AS sclr0 FROM cms_users c0_ WHERE c0_.id = ?"
  );
 
-
- $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\SQLServerPlatform());
- $this->assertSqlGeneration(
- "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1",
- "SELECT c0_.id AS id0 FROM cms_users c0_ WITH (NOLOCK) WHERE (c0_.name + c0_.status + 's') = ?"
- );
- $this->assertSqlGeneration(
- "SELECT CONCAT(u.id, u.name, u.status) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1",
- "SELECT (c0_.id + c0_.name + c0_.status) AS sclr0 FROM cms_users c0_ WITH (NOLOCK) WHERE c0_.id = ?"
- );
-
- $connMock->setDatabasePlatform($orgPlatform);
+ $connMock->setDatabasePlatform(new \Doctrine\DBAL\Platforms\SQLServerPlatform());
+ $this->assertSqlGeneration(
+ "SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE CONCAT(u.name, u.status, 's') = ?1",
+ "SELECT c0_.id AS id0 FROM cms_users c0_ WITH (NOLOCK) WHERE (c0_.name + c0_.status + 's') = ?"
+ );
+ $this->assertSqlGeneration(
+ "SELECT CONCAT(u.id, u.name, u.status) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1",
+ "SELECT (c0_.id + c0_.name + c0_.status) AS sclr0 FROM cms_users c0_ WITH (NOLOCK) WHERE c0_.id = ?"
+ );
+
+ $connMock->setDatabasePlatform($orgPlatform);
  }
+
+ /**
+ * @group DDC-2188
+ */
+ public function testArithmeticPriority()
+ {
+ $this->assertSqlGeneration(
+ 'SELECT 100/(2*2) FROM Doctrine\Tests\Models\CMS\CmsUser u',
+ 'SELECT 100 / (2 * 2) AS sclr0 FROM cms_users c0_'
+ );
+
+ $this->assertSqlGeneration(
+ 'SELECT (u.id / (u.id * 2)) FROM Doctrine\Tests\Models\CMS\CmsUser u',
+ 'SELECT (c0_.id / (c0_.id * 2)) AS sclr0 FROM cms_users c0_'
+ );
+
+ $this->assertSqlGeneration(
+ 'SELECT 100/(2*2) + (u.id / (u.id * 2)) FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id / (u.id * 2)) > 0',
+ 'SELECT 100 / (2 * 2) + (c0_.id / (c0_.id * 2)) AS sclr0 FROM cms_users c0_ WHERE (c0_.id / (c0_.id * 2)) > 0'
+ );
+ }
+
 }
 
 class MyAbsFunction extends \Doctrine\ORM\Query\AST\Functions\FunctionNode