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-3018] Fix string literals in new operator.

Browse Source
This commit is contained in:
Benjamin Eberlei 2014-03-23 15:16:09 +01:00
parent 24d4fd17f3
commit 2aea3036b6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1514,6 +1514,7 @@ class SqlWalker implements TreeWalker
break; break;
} }
$fieldType = 'string';
switch (true) { switch (true) {
case ($e instanceof AST\PathExpression): case ($e instanceof AST\PathExpression):
$fieldName = $e->field; $fieldName = $e->field;
@ -1534,10 +1535,6 @@ class SqlWalker implements TreeWalker
break; break;
} }
break; break;
default:
$fieldType = 'string';
break;
} }
$this->scalarResultAliasMap[$resultAlias] = $columnAlias; $this->scalarResultAliasMap[$resultAlias] = $columnAlias;

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

@ -592,7 +592,7 @@ class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase
} }
/** /**
* @gorup DDC-1858 * @group DDC-1858
*/ */
public function testHavingSupportIsNullExpression() public function testHavingSupportIsNullExpression()
{ {
@ -600,12 +600,20 @@ class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase
} }
/** /**
* @gorup DDC-1858 * @group DDC-1858
*/ */
public function testHavingSupportLikeExpression() public function testHavingSupportLikeExpression()
{ {
$this->assertValidDQL("SELECT _u.id, count(_articles) as uuuu FROM Doctrine\Tests\Models\CMS\CmsUser _u LEFT JOIN _u.articles _articles GROUP BY _u HAVING uuuu LIKE '3'"); $this->assertValidDQL("SELECT _u.id, count(_articles) as uuuu FROM Doctrine\Tests\Models\CMS\CmsUser _u LEFT JOIN _u.articles _articles GROUP BY _u HAVING uuuu LIKE '3'");
} }
/**
* @group DDC-3018
*/
public function testNewLiteralExpression()
{
$this->assertValidDQL("SELECT new " . __NAMESPACE__ . "\\DummyStruct(u.id, 'foo', 1, true) FROM Doctrine\Tests\Models\CMS\CmsUser u");
}
} }
/** @Entity */ /** @Entity */
@ -625,3 +633,10 @@ class DQLKeywordsModelGroup
/** @Column */ /** @Column */
private $from; private $from;
} }
class DummyStruct
{
public function __construct($id, $arg1, $arg2, $arg3)
{
}
}