Skip to content

Commit e94623e

Browse files
pfilsxpfilsx
committed
add new functions
1 parent 2385f3e commit e94623e

File tree

6 files changed

+129
-10
lines changed

6 files changed

+129
-10
lines changed

‎docs/Functions-and-Operators.md

+2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
| CAST() | CAST | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\Cast](../src/ORM/Query/AST/Functions/Cast.php) |
99
| CEIL() | CEIL | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\Ceil](../src/ORM/Query/AST/Functions/Ceil.php) |
1010
| COUNT() | COUNT | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\Count](../src/ORM/Query/AST/Functions/Count.php) |
11+
| EXTRACT() | EXTRACT | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\Extract](../src/ORM/Query/AST/Functions/Extract.php) |
1112
| FLOOR() | FLOOR | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\Floor](../src/ORM/Query/AST/Functions/Floor.php) |
13+
| ILIKE() | ILIKE | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\ILike](../src/ORM/Query/AST/Functions/ILike.php) |
1214
| JSON_AGG() | JSON_AGG | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\JsonAgg](../src/ORM/Query/AST/Functions/JsonAgg.php) |
1315
| JSON_ARRAY_LENGTH() | JSON_ARRAY_LENGTH | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\JsonArrayLength](../src/ORM/Query/AST/Functions/JsonArrayLength.php) |
1416
| JSONB_AGG() | JSONB_AGG | [Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions\JsonbAgg](../src/ORM/Query/AST/Functions/JsonbAgg.php) |

‎src/DBAL/Platform/PostgreSQLPlatform.php

+6-8
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public function getAlterTypeSql(EnumTypeAsset $from, EnumTypeAsset $to): array
102102
$result[] = sprintf('ALTER TABLE %s ALTER COLUMN %s DROP DEFAULT', $tableName, $columnName);
103103
}
104104
$result[] = sprintf(
105-
'ALTER TABLE %1$s ALTER COLUMN %2$s TYPE %3$s USING LOWER(%2$s::text)::%3$s',
105+
'ALTER TABLE %1$s ALTER COLUMN %2$s TYPE %3$s USING (%2$s::text)::%3$s',
106106
$tableName,
107107
$columnName,
108108
$typeName
@@ -128,15 +128,13 @@ public function getDropTypeSql(EnumTypeAsset $type): string
128128
return "DROP TYPE {$type->getQuotedName($this)}";
129129
}
130130

131-
public function quoteEnumLabel(mixed $label): int|string
131+
public function quoteEnumLabel(mixed $label): string
132132
{
133-
if (\is_string($label)) {
134-
return $this->quoteStringLiteral($label);
135-
} elseif (\is_int($label)) {
136-
return $label;
137-
} else {
138-
throw new InvalidArgumentException('Invalid custom type labels specified. Only string and integers are supported');
133+
if (!\is_string($label)) {
134+
throw new InvalidArgumentException('Invalid custom type labels specified. Only string labels are supported');
139135
}
136+
137+
return $this->quoteStringLiteral($label);
140138
}
141139

142140
public function columnsEqual(Column $column1, Column $column2): bool

‎src/ORM/Query/AST/Functions/Extract.php

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions;
6+
7+
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
8+
use Doctrine\ORM\Query\AST\Node;
9+
use Doctrine\ORM\Query\Lexer;
10+
use Doctrine\ORM\Query\Parser;
11+
use Doctrine\ORM\Query\SqlWalker;
12+
13+
/**
14+
* Implementation of PostgreSql EXTRACT function.
15+
*
16+
* @see https://www.postgresql.org/docs/current/functions-datetime.html#FUNCTIONS-DATETIME-EXTRACT
17+
*
18+
* @example EXTRACT(EPOCH FROM entity.field)
19+
* @example EXTRACT(DAY FROM entity2.field)
20+
*/
21+
class Extract extends FunctionNode
22+
{
23+
private string $expr;
24+
25+
private Node $from;
26+
27+
public function parse(Parser $parser): void
28+
{
29+
$parser->match(Lexer::T_IDENTIFIER);
30+
$parser->match(Lexer::T_OPEN_PARENTHESIS);
31+
32+
$parser->match(Lexer::T_IDENTIFIER);
33+
$this->expr = $parser->getLexer()->token['value'];
34+
$parser->match(Lexer::T_FROM);
35+
36+
$this->from = $parser->StringPrimary();
37+
38+
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
39+
}
40+
41+
public function getSql(SqlWalker $sqlWalker): string
42+
{
43+
return \sprintf('EXTRACT(%s FROM %s)', $this->expr, $this->from->dispatch($sqlWalker));
44+
}
45+
}

‎src/ORM/Query/AST/Functions/ILike.php

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions;
6+
7+
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
8+
use Doctrine\ORM\Query\AST\Node;
9+
use Doctrine\ORM\Query\Lexer;
10+
use Doctrine\ORM\Query\Parser;
11+
use Doctrine\ORM\Query\SqlWalker;
12+
13+
/**
14+
* Implementation of PostgreSql ILIKE() function.
15+
*
16+
* @see https://www.postgresql.org/docs/current/functions-matching.html#FUNCTIONS-LIKE
17+
*
18+
* @example ILIKE(entity.field, 'text')
19+
* @example ILIKE(entity.field, entity2.field)
20+
* @example ILIKE(entity.field, ANY ARRAY(:texts))
21+
*/
22+
class ILike extends FunctionNode
23+
{
24+
private Node $field;
25+
26+
private Node $text;
27+
28+
private bool $multiple = false;
29+
30+
public function parse(Parser $parser): void
31+
{
32+
$parser->match(Lexer::T_IDENTIFIER);
33+
$parser->match(Lexer::T_OPEN_PARENTHESIS);
34+
$this->field = $parser->StringPrimary();
35+
$parser->match(Lexer::T_COMMA);
36+
37+
$lexer = $parser->getLexer();
38+
39+
if ($lexer->isNextToken(Lexer::T_ANY)) {
40+
$parser->match(Lexer::T_ANY);
41+
$this->multiple = true;
42+
}
43+
44+
$this->text = $parser->StringPrimary();
45+
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
46+
}
47+
48+
public function getSql(SqlWalker $sqlWalker): string
49+
{
50+
return \sprintf(
51+
'(%s ILIKE %s)',
52+
$this->field->dispatch($sqlWalker),
53+
$this->multiple ? "ANY ({$this->text->dispatch($sqlWalker)})" : $this->text->dispatch($sqlWalker),
54+
);
55+
}
56+
}

‎src/ORM/Query/AST/Functions/JsonBuildObject.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
namespace Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions;
66

7+
use Doctrine\DBAL\Types\Type;
8+
use Doctrine\DBAL\Types\Types;
9+
use Doctrine\ORM\Query\AST\TypedExpression;
10+
711
/**
812
* Implementation of PostgreSql JSON_BUILD_OBJECT() function.
913
*
@@ -12,10 +16,15 @@
1216
* @example JSON_BUILD_OBJECT('key1', entity.field, 'key2', entity.field2)
1317
* @example JSON_BUILD_OBJECT(entity.field, entity.field2)
1418
*/
15-
class JsonBuildObject extends AbstractJsonBuildFunction
19+
class JsonBuildObject extends AbstractJsonBuildFunction implements TypedExpression
1620
{
1721
protected function getFunctionName(): string
1822
{
1923
return 'JSON_BUILD_OBJECT';
2024
}
25+
26+
public function getReturnType(): Type
27+
{
28+
return Type::getType(Types::JSON);
29+
}
2130
}

‎src/ORM/Query/AST/Functions/JsonbBuildObject.php

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
namespace Pfilsx\PostgreSQLDoctrine\ORM\Query\AST\Functions;
66

7+
use Doctrine\DBAL\Types\Type;
8+
use Doctrine\DBAL\Types\Types;
9+
use Doctrine\ORM\Query\AST\TypedExpression;
10+
711
/**
812
* Implementation of PostgreSql JSONB_BUILD_OBJECT() function.
913
*
@@ -12,10 +16,15 @@
1216
* @example JSONB_BUILD_OBJECT('key1', entity.field, 'key2', entity.field2)
1317
* @example JSONB_BUILD_OBJECT(entity.field, entity.field2)
1418
*/
15-
class JsonbBuildObject extends AbstractJsonBuildFunction
19+
class JsonbBuildObject extends AbstractJsonBuildFunction implements TypedExpression
1620
{
1721
protected function getFunctionName(): string
1822
{
1923
return 'JSONB_BUILD_OBJECT';
2024
}
25+
26+
public function getReturnType(): Type
27+
{
28+
return Type::getType(Types::JSON);
29+
}
2130
}

0 commit comments

Comments
 (0)