RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Добавлена поддержка оператора UNION для postgres. Доступен только в операциях с IN

Browse source
This commit is contained in:
Vasiagin Sergei 2024-08-07 11:50:07 +03:00
parent fee2cbe6b4
commit ea6a8f78aa
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Doctrine/ORM/Query/AST/InExpression.php
View file

@ -45,7 +45,7 @@ class InExpression extends Node
public $literals = array();
/**
* @var Subselect|null
* @var array<Subselect>|null
*/
public $subselect;

1
lib/Doctrine/ORM/Query/Lexer.php
View file

@ -109,6 +109,7 @@ class Lexer extends \Doctrine\Common\Lexer
const T_WITH = 155;
const T_PARTIAL = 156;
const T_NEW = 157;
const T_UNION = 158;
/**
* Creates a new query scanner object.

6
lib/Doctrine/ORM/Query/Parser.php
View file

@ -3063,7 +3063,11 @@ class Parser
$this->match(Lexer::T_OPEN_PARENTHESIS);
if ($this->lexer->isNextToken(Lexer::T_SELECT)) {
$inExpression->subselect = $this->Subselect();
$inExpression->subselect = [$this->Subselect()];
while ($this->lexer->isNextToken(Lexer::T_UNION)) {
$this->match(Lexer::T_UNION);
$inExpression->subselect[] = $this->Subselect();
}
} else {
$literals = array();
$literals[] = $this->InParameter();

2
lib/Doctrine/ORM/Query/SqlWalker.php
View file

@ -2048,7 +2048,7 @@ class SqlWalker implements TreeWalker
$sql = $this->walkArithmeticExpression($inExpr->expression) . ($inExpr->not ? ' NOT' : '') . ' IN (';
$sql .= ($inExpr->subselect)
? $this->walkSubselect($inExpr->subselect)
? implode(' UNION ', array_map(function ($subselect) {return $this->walkSubselect($subselect);}, $inExpr->subselect))
: implode(', ', array_map(array($this, 'walkInParameter'), $inExpr->literals));
$sql .= ')';