RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

DDC-3075 Added support for subqueries in NEW operator.

Browse Source
This commit is contained in:
Guilherme Blanco 2014-04-20 14:40:51 +00:00
parent 38b6838386
commit a3f95d919b
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Doctrine/ORM/Query/Parser.php
View File

@ -1811,14 +1811,23 @@ class Parser
}
/**
* NewObjectArg ::= ScalarExpression
* NewObjectArg ::= ScalarExpression | "(" Subselect ")"
*
* @TODO - Maybe you should support other expressions and nested "new" operator
*
* @return \Doctrine\ORM\Query\AST\SimpleSelectExpression
* @return mixed
*/
public function NewObjectArg()
{
$token = $this->lexer->lookahead;
$peek = $this->lexer->glimpse();
if ($token['type'] === Lexer::T_OPEN_PARENTHESIS && $peek['type'] === Lexer::T_SELECT) {
$this->match(Lexer::T_OPEN_PARENTHESIS);
$expression = $this->Subselect();
$this->match(Lexer::T_CLOSE_PARENTHESIS);
return $expression;
}
return $this->ScalarExpression();
}

16
lib/Doctrine/ORM/Query/SqlWalker.php
View File

@ -1503,25 +1503,25 @@ class SqlWalker implements TreeWalker
foreach ($newObjectExpression->args as $argIndex => $e) {
$resultAlias = $this->scalarResultCounter++;
$columnAlias = $this->getSQLColumnAlias('sclr');
$fieldType = 'string';
switch (true) {
case ($e instanceof AST\NewObjectExpression):
$sqlSelectExpressions[] = $e->dispatch($this);
break;
default:
$sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
case ($e instanceof AST\Subselect):
$sqlSelectExpressions[] = '(' . $e->dispatch($this) . ') AS ' . $columnAlias;
break;
}
$fieldType = 'string';
switch (true) {
case ($e instanceof AST\PathExpression):
$fieldName = $e->field;
$dqlAlias = $e->identificationVariable;
$qComp = $this->queryComponents[$dqlAlias];
$class = $qComp['metadata'];
$fieldType = $class->getTypeOfField($fieldName);
$sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
break;
case ($e instanceof AST\Literal):
@ -1534,6 +1534,12 @@ class SqlWalker implements TreeWalker
$fieldType = is_float($e->value) ? 'float' : 'integer';
break;
}
$sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
break;
default:
$sqlSelectExpressions[] = trim($e->dispatch($this)) . ' AS ' . $columnAlias;
break;
}

8
tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php
View File

@ -612,6 +612,14 @@ class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase
{
$this->assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
}
/**
* @group DDC-3075
*/
public function testNewLiteralWithSubselectExpression()
{
$this->assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
}
}
/** @Entity */

4
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View File

@ -1707,6 +1707,10 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase
"SELECT c0_.id AS sclr_0, c0_.country AS sclr_1, c0_.city AS sclr_2, c1_.name AS sclr_3, c2_.email AS sclr_4 FROM cms_users c1_ INNER JOIN cms_emails c2_ ON c1_.email_id = c2_.id INNER JOIN cms_addresses c0_ ON c1_.id = c0_.user_id ORDER BY c1_.name ASC"
);
$this->assertSqlGeneration(
"SELECT new Doctrine\Tests\Models\CMS\CmsUserDTO(a.id, (SELECT 1 FROM Doctrine\Tests\Models\CMS\CmsUser su), a.country, a.city), new Doctrine\Tests\Models\CMS\CmsAddressDTO(u.name, e.email) FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.email e JOIN u.address a ORDER BY u.name",
"SELECT c0_.id AS sclr_0, (SELECT 1 AS sclr_2 FROM cms_users c1_) AS sclr_1, c0_.country AS sclr_3, c0_.city AS sclr_4, c2_.name AS sclr_5, c3_.email AS sclr_6 FROM cms_users c2_ INNER JOIN cms_emails c3_ ON c2_.email_id = c3_.id INNER JOIN cms_addresses c0_ ON c2_.id = c0_.user_id ORDER BY c2_.name ASC"
);
}
/**