Skip to content

Add support for custom types with requireSQLConversion and ResultSetMappingBuilder::generateSelectClause() #9326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2022
Merged

Add support for custom types with requireSQLConversion and ResultSetMappingBuilder::generateSelectClause() #9326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Doctrine\ORM\Query;

use Doctrine\DBAL\Types\Type;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Internal\SQLResultCasing;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
Expand Down Expand Up @@ -432,19 +433,26 @@ public function generateSelectClause($tableAliases = [])
foreach ($this->columnOwnerMap as $columnName => $dqlAlias) {
$tableAlias = $tableAliases[$dqlAlias] ?? $dqlAlias;

if ($sql) {
if ($sql !== '') {
$sql .= ', ';
}

$sql .= $tableAlias . '.';

if (isset($this->fieldMappings[$columnName])) {
$class = $this->em->getClassMetadata($this->declaringClasses[$columnName]);
$sql .= $class->fieldMappings[$this->fieldMappings[$columnName]]['columnName'];
$class = $this->em->getClassMetadata($this->declaringClasses[$columnName]);
$fieldName = $this->fieldMappings[$columnName];
$classFieldMapping = $class->fieldMappings[$fieldName];
$columnSql = $tableAlias . '.' . $classFieldMapping['columnName'];
Copy link
Member Author

@kimhemsoe kimhemsoe Jan 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@beberlei What we if i add a FieldMapping class with array access in another PR? How much will break? Or is there another better plan to get rid of some of the many arrays?

Copy link
Member

@beberlei beberlei Jan 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is a 3.0 task


if (isset($classFieldMapping['requireSQLConversion']) && $classFieldMapping['requireSQLConversion'] === true) {
$type = Type::getType($classFieldMapping['type']);
$columnSql = $type->convertToPHPValueSQL($columnSql, $this->em->getConnection()->getDatabasePlatform());
}

$sql .= $columnSql;
} elseif (isset($this->metaMappings[$columnName])) {
$sql .= $this->metaMappings[$columnName];
$sql .= $tableAlias . '.' . $this->metaMappings[$columnName];
} elseif (isset($this->discriminatorColumns[$dqlAlias])) {
$sql .= $this->discriminatorColumns[$dqlAlias];
$sql .= $tableAlias . '.' . $this->discriminatorColumns[$dqlAlias];
}

$sql .= ' AS ' . $columnName;
Expand Down
37 changes: 37 additions & 0 deletions tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type as DBALType;
use Doctrine\Deprecations\PHPUnit\VerifyDeprecations;
use Doctrine\ORM\Internal\Hydration\HydrationException;
use Doctrine\ORM\Internal\SQLResultCasing;
use Doctrine\ORM\PersistentCollection;
use Doctrine\ORM\Query\Parameter;
use Doctrine\ORM\Query\ResultSetMapping;
use Doctrine\ORM\Query\ResultSetMappingBuilder;
use Doctrine\Tests\DbalTypes\UpperCaseStringType;
use Doctrine\Tests\Models\CMS\CmsAddress;
use Doctrine\Tests\Models\CMS\CmsEmail;
use Doctrine\Tests\Models\CMS\CmsPhonenumber;
Expand All @@ -22,6 +24,7 @@
use Doctrine\Tests\Models\Company\CompanyFixContract;
use Doctrine\Tests\Models\Company\CompanyFlexContract;
use Doctrine\Tests\Models\Company\CompanyPerson;
use Doctrine\Tests\Models\CustomType\CustomTypeUpperCase;
use Doctrine\Tests\Models\DDC3899\DDC3899FixContract;
use Doctrine\Tests\Models\DDC3899\DDC3899User;
use Doctrine\Tests\OrmFunctionalTestCase;
Expand Down Expand Up @@ -796,4 +799,38 @@ public function testGenerateSelectClauseWithDiscriminatorColumn(): void

$this->assertSQLEquals('u1.id as id, c1.discr as discr', $selectClause);
}

public function testGenerateSelectClauseWithCustomTypeUsingEntityFromClassMetadata(): void
{
if (DBALType::hasType('upper_case_string')) {
DBALType::overrideType('upper_case_string', UpperCaseStringType::class);
} else {
DBALType::addType('upper_case_string', UpperCaseStringType::class);
}

$rsm = new ResultSetMappingBuilder($this->_em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT);

$rsm->addRootEntityFromClassMetadata(CustomTypeUpperCase::class, 'ct');

$selectClause = $rsm->generateSelectClause(['ct' => 'ct1']);

$this->assertSQLEquals('ct1.id as id0, lower(ct1.lowercasestring) as lowercasestring1, lower(ct1.named_lower_case_string) as named_lower_case_string2', $selectClause);
}

public function testGenerateSelectClauseWithCustomTypeUsingAddFieldResult(): void
{
if (DBALType::hasType('upper_case_string')) {
DBALType::overrideType('upper_case_string', UpperCaseStringType::class);
} else {
DBALType::addType('upper_case_string', UpperCaseStringType::class);
}

$rsm = new ResultSetMappingBuilder($this->_em, ResultSetMappingBuilder::COLUMN_RENAMING_INCREMENT);
$rsm->addEntityResult(CustomTypeUpperCase::class, 'ct');
$rsm->addFieldResult('ct', $this->getSQLResultCasing($this->platform, 'lowercasestring'), 'lowerCaseString');

$selectClause = $rsm->generateSelectClause(['ct' => 'ct1']);

$this->assertSQLEquals('lower(ct1.lowercasestring) as lowercasestring', $selectClause);
}
}