Xylphid master

README.md

@@ -13,10 +13,10 @@ 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_BASE64, 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, JSON_CONTAINS, JSON_DEPTH, JSON_LENGTH, 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, TRUNCATE, UNHEX, UNIX_TIMESTAMP, UTC_TIMESTAMP, UUID_SHORT, VARIANCE, WEEK, WEEKDAY, WEEKOFYEAR, YEAR, YEARMONTH, YEARWEEK` |
+| 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_BASE64, 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, JSON_CONTAINS, JSON_DEPTH, JSON_LENGTH, LAG, LAST_DAY, LEAD, LEAST, LOG, LOG10, LOG2, LPAD, MAKEDATE, MATCH, MD5, MINUTE, MONTH, MONTHNAME, NOW, NULLIF, OVER, PERIOD_DIFF, PI, POINT, POWER, QUARTER, RADIANS, RAND, REGEXP, REPLACE, ROUND, RPAD, SECOND, SECTOTIME, SHA1, SHA2, SIN, SOUNDEX, STD, STDDEV, STRTODATE, ST_DISTANCE_SPHERE, STR_TO_DATE, SUBSTRING_INDEX, TAN, TIME, TIMEDIFF, TIMESTAMPADD, TIMESTAMPDIFF, TIMETOSEC, TRUNCATE, UNHEX, UNIX_TIMESTAMP, UTC_TIMESTAMP, UUID_SHORT, VARIANCE, WEEK, WEEKDAY, WEEKOFYEAR, YEAR, YEARMONTH, YEARWEEK` |
 | Oracle | `CEIL, DAY, FLOOR, HOUR, LISTAGG, MINUTE, MONTH, NVL, SECOND, TO_CHAR, TO_DATE, TRUNC, YEAR` |
 | SQLite | `CASE WHEN THEN ELSE END, DATE, DATE_FORMAT*, DAY, HOUR, IFNULL, JULIANDAY, MINUTE, MONTH, REPLACE, ROUND, SECOND, STRFTIME, WEEK, WEEKDAY, YEAR` |
-| PostgreSQL | `AT_TIME_ZONE, COUNT_FILTER, DATE, DATE_PART, DATE_TRUNC, DAY, EXTRACT, GREATEST, HOUR, LEAST, MINUTE, MONTH, REGEXP_REPLACE, SECOND, STRING_AGG, TO_CHAR, TO_DATE, YEAR` |
+| PostgreSQL | `AT_TIME_ZONE, CAST, COUNT_FILTER, DATE, DATE_PART, DATE_TRUNC, DAY, EXTRACT, GREATEST, HOUR, LEAST, MINUTE, MONTH, NOW, REGEXP_REPLACE, SECOND, STRING_AGG, TO_CHAR, TO_DATE, YEAR` |
 
 > Note: SQLite date functions are implemented as `strftime(format, value)`.
   SQLite only supports the [most common formats](https://www.sqlite.org/lang_datefunc.html),

config/mysql.yml

@@ -62,12 +62,14 @@ doctrine:
                  log10: DoctrineExtensions\Query\Mysql\Log10
                  log2: DoctrineExtensions\Query\Mysql\Log2
                  pi: DoctrineExtensions\Query\Mysql\Pi
+                 point: DoctrineExtensions\Query\Mysql\Point
                  power: DoctrineExtensions\Query\Mysql\Power
                  quarter: DoctrineExtensions\Query\Mysql\Quarter
                  radians: DoctrineExtensions\Query\Mysql\Radians
                  rand: DoctrineExtensions\Query\Mysql\Rand
                  round: DoctrineExtensions\Query\Mysql\Round
                  stddev: DoctrineExtensions\Query\Mysql\StdDev
+                 st_distance_sphere: DoctrineExtensions\Query\Mysql\StDistanceSphere
                  sin: DoctrineExtensions\Query\Mysql\Sin
                  std: DoctrineExtensions\Query\Mysql\Std
                  tan: DoctrineExtensions\Query\Mysql\Tan

config/postgres.yml

@@ -8,6 +8,7 @@ doctrine:
                 day: DoctrineExtensions\Query\Postgresql\Day
                 month: DoctrineExtensions\Query\Postgresql\Month
                 year: DoctrineExtensions\Query\Postgresql\Year
+                now: DoctrineExtensions\Query\Postgresql\Now
                 date_format: DoctrineExtensions\Query\Postgresql\DateFormat
                 at_time_zone: DoctrineExtensions\Query\Postgresql\AtTimeZoneFunction
                 date_part: DoctrineExtensions\Query\Postgresql\DatePart
@@ -16,6 +17,7 @@ doctrine:
                 date: DoctrineExtensions\Query\Postgresql\Date
 
             string_functions:
+                cast: DoctrineExtensions\Query\Postgresql\Cast
                 str_to_date: DoctrineExtensions\Query\Postgresql\StrToDate
                 count_filter: DoctrineExtensions\Query\Postgresql\CountFilterFunction
                 string_agg: DoctrineExtensions\Query\Postgresql\StringAgg

src/Query/Mysql/Point.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace DoctrineExtensions\Query\Mysql;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+class Point extends FunctionNode
+{
+    public $latitude;
+
+    public $longitude;
+
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'POINT(%s %s)',
+            $sqlWalker->walkArithmeticPrimary($this->latitude),
+            $sqlWalker->walkArithmeticPrimary($this->longitude)
+        );
+    }
+
+    public function parse(Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->latitude = $parser->ArithmeticPrimary();
+        $this->longitude = $parser->ArithmeticPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Query/Mysql/StDistanceSphere.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace DoctrineExtensions\Query\Mysql;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+class StDistanceSphere extends FunctionNode
+{
+    public $origin;
+
+    public $remote;
+
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'ST_DISTANCE_SPHERE(%s, %s)',
+            $this->origin->dispatch($sqlWalker),
+            $this->remote->dispatch($sqlWalker)
+        );
+    }
+
+    public function parse(Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->origin = $parser->ArithmeticPrimary();
+        $parser->match(Lexer::T_COMMA);
+        $this->remote = $parser->ArithmeticPrimary();
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Query/Postgresql/Cast.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace DoctrineExtensions\Query\Postgresql;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+class Cast extends FunctionNode
+{
+    public $subject;
+
+    public $type;
+
+    public function getSql(SqlWalker $sqlWalker)
+    {
+        return sprintf(
+            'CAST(%s AS %s)',
+            $this->subject->dispatch($sqlWalker),
+            $this->type
+        );
+    }
+
+    public function parse(Parser $parser)
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+        $this->subject = $parser->ArithmeticPrimary();
+        $parser->match(Lexer::T_AS);
+        $parser->match(Lexer::T_IDENTIFIER);
+
+        $lexer = $parser->getLexer();
+        $this->type = $lexer->token['value'];
+
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

src/Query/Postgresql/Now.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace DoctrineExtensions\Query\Postgresql;
+
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+class Now extends FunctionNode
+{
+    public function getSql(SqlWalker $sqlWalker): string
+    {
+        return 'NOW()';
+    }
+
+    public function parse(Parser $parser): void
+    {
+        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+    }
+}

tests/Query/Mysql/PointTest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Mysql;
+
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class PointTest extends MysqlTestCase
+{
+    public function testPoint()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT POINT(1 2) from DoctrineExtensions\Tests\Entities\Blank b",
+            'SELECT POINT(1 2) AS sclr_0 FROM Blank b0_'
+        );
+    }
+}

tests/Query/Mysql/StDistanceSphereTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Mysql;
+
+class StDistanceSphereTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+{
+    public function testStDistanceSphere()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT ST_DISTANCE_SPHERE(1, 2) from DoctrineExtensions\Tests\Entities\Blank b",
+            'SELECT ST_DISTANCE_SPHERE(1, 2) AS sclr_0 FROM Blank b0_'
+        );
+    }
+
+    public function testStDistanceSphereWithExpression()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT ST_DISTANCE_SPHERE(POINT(1 2), POINT(3 4)) from DoctrineExtensions\Tests\Entities\Blank b",
+            'SELECT ST_DISTANCE_SPHERE(POINT(1 2), POINT(3 4)) AS sclr_0 FROM Blank b0_'
+        );
+    }
+}

tests/Query/Postgresql/CastTest.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Postgresql;
+
+class CastTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+{
+    public function testCast()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT CAST(p.created AS timestamp) as casted from DoctrineExtensions\Tests\Entities\Product p",
+            'SELECT CAST(p0_.created AS timestamp) AS sclr_0 FROM Product p0_'
+        );
+    }
+}

tests/Query/Postgresql/DatePartTest.php

@@ -18,4 +18,16 @@ public function testDatePart()
 
         $this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
     }
+
+    public function testDatePartWithExpression()
+    {
+        $queryBuilder = new QueryBuilder($this->entityManager);
+        $queryBuilder
+            ->select("date_part('DAY', dt.created - dt.created)")
+            ->from('DoctrineExtensions\Tests\Entities\Date', 'dt');
+
+        $expected = "SELECT DATE_PART('DAY', d0_.created - d0_.created) AS sclr_0 FROM Date d0_";
+
+        $this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
+    }
 }

tests/Query/Postgresql/NowTest.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace DoctrineExtensions\Tests\Query\Postgresql;
+
+class NowTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+{
+    public function testNow()
+    {
+        $this->assertDqlProducesSql(
+            "SELECT NOW() FROM DoctrineExtensions\Tests\Entities\Blank b",
+            'SELECT NOW() AS sclr_0 FROM Blank b0_'
+        );
+    }
+}