Oracle CEIL/FLOOR functions + TO_CHAR nlsparam (beberlei#336)

Author: jeffersonvantuir

README.md

@@ -14,7 +14,7 @@ MySQL, Oracle, PostgreSQL and SQLite.
 | DB | Functions |
 |:--:|:---------:|
 | MySQL | `ACOS, ADDTIME, AES_DECRYPT, AES_ENCRYPT, ANY_VALUE, ASCII, ASIN, ATAN, ATAN2, BINARY, BIT_COUNT, BIT_XOR, CAST, CEIL, CHAR_LENGTH, COLLATE, CONCAT_WS, CONVERT_TZ, COS, COT, COUNTIF, CRC32, DATE, DATE_FORMAT, DATEADD, DATEDIFF, DATESUB, DAY, DAYNAME, DAYOFWEEK, DAYOFYEAR, DEGREES, DIV, EXP, EXTRACT, FIELD, FIND_IN_SET, FLOOR, FORMAT, FROM_UNIXTIME, GREATEST, GROUP_CONCAT, HEX, HOUR, IFELSE, IFNULL, INET_ATON, INET_NTOA, INET6_ATON, INET6_NTOA, INSTR, IS_IPV4, IS_IPV4_COMPAT, IS_IPV4_MAPPED, IS_IPV6, LAG, LAST_DAY, LEAD, LEAST, LOG, LOG10, LOG2, LPAD, MAKEDATE, MATCH, MD5, MINUTE, MONTH, MONTHNAME, NOW, NULLIF, OVER, PERIOD_DIFF, PI, POWER, QUARTER, RADIANS, RAND, REGEXP, REPLACE, ROUND, RPAD, SECOND, SECTOTIME, SHA1, SHA2, SIN, SOUNDEX, STD, STDDEV, STRTODATE, STR_TO_DATE, SUBSTRING_INDEX, TAN, TIME, TIMEDIFF, TIMESTAMPADD, TIMESTAMPDIFF, TIMETOSEC, UNHEX, UNIX_TIMESTAMP, UTC_TIMESTAMP, UUID_SHORT, VARIANCE, WEEK, WEEKDAY, YEAR, YEARMONTH, YEARWEEK` |
-| Oracle | `DAY, LISTAGG, MONTH, NVL, TO_CHAR, TO_DATE, TRUNC, YEAR` |
+| Oracle | `CEIL, DAY, FLOOR, LISTAGG, MONTH, NVL, TO_CHAR, TO_DATE, TRUNC, YEAR` |
 | Sqlite | `DATE, MINUTE, HOUR, DAY, WEEK, WEEKDAY, MONTH, YEAR, JULIANDAY, STRFTIME, DATE_FORMAT*, CASE WHEN THEN ELSE END, IFNULL, REPLACE, ROUND` |
 | PostgreSQL | `AT_TIME_ZONE, COUNT_FILTER, DATE_PART, EXTRACT, GREATEST, LEAST, REGEXP_REPLACE, STRING_AGG, TO_CHAR, TO_DATE` |
 

config/oracle.yml

@@ -12,3 +12,7 @@ doctrine:
                 nvl: DoctrineExtensions\Query\Oracle\Nvl
                 listagg: DoctrineExtensions\Query\Oracle\Listagg
                 to_date: DoctrineExtensions\Query\Oracle\ToDate
+
+            numeric_functions:
+                ceil: DoctrineExtensions\Query\Oracle\Ceil
+                floor: DoctrineExtensions\Query\Oracle\Floor

src/Query/Oracle/Ceil.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace DoctrineExtensions\Query\Oracle;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * @author Jefferson Vantuir <[email protected]>
+ */
+class Ceil extends FunctionNode
+{
+    private $number;
+
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'CEIL(%s)',
+            $sqlWalker->walkArithmeticPrimary($this->number)
+        );
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $this->number = $parser->ArithmeticExpression();
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Query/Oracle/Floor.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace DoctrineExtensions\Query\Oracle;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+
+/**
+ * @author Jefferson Vantuir <[email protected]>
+ */
+class Floor extends FunctionNode
+{
+    private $number;
+
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'FLOOR(%s)',
+            $sqlWalker->walkArithmeticPrimary($this->number)
+        );
+    }
+
+    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $this->number = $parser->ArithmeticExpression();
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Query/Oracle/ToChar.php

@@ -14,8 +14,19 @@ class ToChar extends FunctionNode
 
     private $fmt;
 
+    private $nls = null;
+
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
+        if ($this->nls) {
+            return sprintf(
+                'TO_CHAR(%s, %s, %s)',
+                $sqlWalker->walkArithmeticPrimary($this->datetime),
+                $sqlWalker->walkArithmeticPrimary($this->fmt),
+                $sqlWalker->walkArithmeticPrimary($this->nls)
+            );
+        }
+
         return sprintf(
             'TO_CHAR(%s, %s)',
             $sqlWalker->walkArithmeticPrimary($this->datetime),
@@ -25,11 +36,19 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
 
     public function parse(\Doctrine\ORM\Query\Parser $parser)
     {
+        $lexer = $parser->getLexer();
+
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
         $this->datetime = $parser->ArithmeticExpression();
         $parser->match(Lexer::T_COMMA);
         $this->fmt = $parser->StringExpression();
+
+        if ($lexer->isNextToken(Lexer::T_COMMA)) {
+            $parser->match(Lexer::T_COMMA);
+            $this->nls = $parser->StringExpression();
+        }
+
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 }

tests/Entities/Product.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Entities;
+
+/**
+ * @Entity
+ */
+class Product
+{
+    /** @Id @Column(type="string") @GeneratedValue */
+    public $id;
+
+    /**
+     * @Column(type="string")
+     */
+    public $name;
+
+    /**
+     * @Column(type="DateTime")
+     */
+    public $created;
+
+    /**
+     * @Column(type="decimal", precision=10, scale=2)
+     */
+    public $price;
+
+    /**
+     * @Column(type="decimal", precision=5, scale=2)
+     */
+    public $weight;
+}

tests/Query/Oracle/CeilTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Oracle;
+
+use Doctrine\ORM\QueryBuilder;
+use DoctrineExtensions\Tests\Entities\Product;
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+/**
+ * @author Jefferson Vantuir <[email protected]>
+ */
+class CeilTest extends OracleTestCase
+{
+    public function testFullQuery()
+    {
+        $queryBuilder = new QueryBuilder($this->entityManager);
+        $queryBuilder->select('CEIL(p.weight)')
+            ->from(Product::class, 'p');
+
+        $sql = 'SELECT CEIL(p0_.weight) AS sclr_0 FROM Product p0_';
+        $this->assertEquals($sql, $queryBuilder->getQuery()->getSQL());
+    }
+}

tests/Query/Oracle/FloorTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Oracle;
+
+use Doctrine\ORM\QueryBuilder;
+use DoctrineExtensions\Tests\Entities\Product;
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+/**
+ * @author Jefferson Vantuir <[email protected]>
+ */
+class FloorTest extends OracleTestCase
+{
+    public function testFullQuery()
+    {
+        $queryBuilder = new QueryBuilder($this->entityManager);
+        $queryBuilder->select('FLOOR(p.weight)')
+            ->from(Product::class, 'p');
+
+        $sql = 'SELECT FLOOR(p0_.weight) AS sclr_0 FROM Product p0_';
+        $this->assertEquals($sql, $queryBuilder->getQuery()->getSQL());
+    }
+}

tests/Query/Oracle/ToCharTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Oracle;
+
+use Doctrine\ORM\QueryBuilder;
+use DoctrineExtensions\Tests\Entities\Date;
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+/**
+ * @author Jefferson Vantuir <[email protected]>
+ */
+class ToCharTest extends OracleTestCase
+{
+    public function testFullQuery()
+    {
+        $queryBuilder = new QueryBuilder($this->entityManager);
+        $queryBuilder->select('TO_CHAR(d.created, \'DD-MON-YYYY HH24:MI:SSxFF\', \'german\')')
+            ->from(Date::class, 'd');
+
+        $sql = 'SELECT TO_CHAR(d0_.created, \'DD-MON-YYYY HH24:MI:SSxFF\', \'german\') AS sclr_0 FROM Date d0_';
+        $this->assertEquals($sql, $queryBuilder->getQuery()->getSQL());
+    }
+}