Optional second parameter (fmt) for Oracle TRUNC function + test. (#301)

Oracle TRUNC function fmt parameter is optional

Author: nitso

src/Query/Oracle/Trunc.php

@@ -3,33 +3,53 @@
 namespace DoctrineExtensions\Query\Oracle;
 
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\Node;
 use Doctrine\ORM\Query\Lexer;
 
 /**
  * @author Mohammad ZeinEddin <[email protected]>
  */
 class Trunc extends FunctionNode
 {
+    /**
+     * @var Node
+     */
     private $date;
 
+    /**
+     * @var Node
+     */
     private $fmt;
 
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return sprintf(
+        if ($this->fmt) {
+            return sprintf(
                 'TRUNC(%s, %s)',
                 $sqlWalker->walkArithmeticPrimary($this->date),
                 $sqlWalker->walkArithmeticPrimary($this->fmt)
+            );
+        }
+
+        return sprintf(
+            'TRUNC(%s)',
+            $sqlWalker->walkArithmeticPrimary($this->date)
         );
     }
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
     {
+        $lexer = $parser->getLexer();
+
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
         $this->date = $parser->ArithmeticExpression();
-        $parser->match(Lexer::T_COMMA);
-        $this->fmt = $parser->StringExpression();
+
+        if ($lexer->isNextToken(Lexer::T_COMMA)) {
+            $parser->match(Lexer::T_COMMA);
+            $this->fmt = $parser->StringExpression();
+        }
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }

tests/Query/Oracle/TruncTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Query\Oracle;
+
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+/**
+ * @author Alexey Kalinin <[email protected]>
+ */
+class TruncTest extends OracleTestCase
+{
+    public function testFullQuery()
+    {
+        $dql = 'SELECT TRUNC(d.created, \'YYYY\') FROM DoctrineExtensions\\Tests\\Entities\\Date d';
+        $q = $this->entityManager->createQuery($dql);
+
+        $sql = 'SELECT TRUNC(d0_.created, \'YYYY\') AS sclr_0 FROM Date d0_';
+        $this->assertEquals($sql, $q->getSql());
+    }
+
+    public function testShortQuery()
+    {
+        $dql = 'SELECT TRUNC(d.created) FROM DoctrineExtensions\\Tests\\Entities\\Date d';
+        $q = $this->entityManager->createQuery($dql);
+
+        $sql = 'SELECT TRUNC(d0_.created) AS sclr_0 FROM Date d0_';
+        $this->assertEquals($sql, $q->getSql());
+    }
+}