Skip to content
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.

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

Infer type from field instead of column #9153

Merged
merged 1 commit into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public function loadCriteria(PersistentCollection $collection, Criteria $criteri
$field = $this->quoteStrategy->getColumnName($name, $targetClass, $this->platform);
$whereClauses[] = sprintf('te.%s %s ?', $field, $operator);
$params[] = $value;
$paramTypes[] = PersisterHelper::getTypeOfColumn($field, $targetClass, $this->em);
$paramTypes[] = PersisterHelper::getTypeOfField($name, $targetClass, $this->em)[0];
}

$tableName = $this->quoteStrategy->getTableName($targetClass, $this->platform);
Expand Down
217 changes: 217 additions & 0 deletions tests/Doctrine/Tests/ORM/Functional/Ticket/GH9109Test.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
<?php

declare(strict_types=1);

namespace Doctrine\Tests\ORM\Functional\Ticket;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\Criteria;
use Doctrine\ORM\Mapping\Column;
use Doctrine\ORM\Mapping\Entity;
use Doctrine\ORM\Mapping\GeneratedValue;
use Doctrine\ORM\Mapping\Id;
use Doctrine\ORM\Mapping\ManyToMany;
use Doctrine\Tests\OrmFunctionalTestCase;

/**
* @group GH-9109
*/
class GH9109Test extends OrmFunctionalTestCase
{
protected function setUp(): void
{
parent::setUp();

$this->_schemaTool->createSchema(
[
$this->_em->getClassMetadata(GH9109User::class),
$this->_em->getClassMetadata(GH9109Product::class),
]
);
armenio marked this conversation as resolved.
Show resolved Hide resolved
}

protected function tearDown(): void
{
$this->_schemaTool->dropSchema(
[
$this->_em->getClassMetadata(GH9109User::class),
$this->_em->getClassMetadata(GH9109Product::class),
]
);

parent::tearDown();
}

public function testIssue(): void
{
$userFirstName = 'GH9109Test';
$userLastName = 'UserGH9109';
$productTitle = 'Test product';

$userRepository = $this->_em->getRepository(GH9109User::class);

$user = new GH9109User();
$user->setFirstName($userFirstName);
$user->setLastName($userLastName);

$product = new GH9109Product();
$product->setTitle($productTitle);

$this->_em->persist($user);
$this->_em->persist($product);
$this->_em->flush();

$product->addBuyer($user);

$this->_em->persist($product);
$this->_em->flush();

$this->_em->clear();

$persistedProduct = $this->_em->find(GH9109Product::class, $product->getId());

// assert Product was persisted
self::assertInstanceOf(GH9109Product::class, $persistedProduct);
self::assertEquals($productTitle, $persistedProduct->getTitle());

// assert Product has a Buyer
$count = $persistedProduct->getBuyers()->count();
self::assertEquals(1, $count);

// assert NOT QUOTED will WORK with findOneBy
$user = $userRepository->findOneBy(['lastName' => $userLastName]);
self::assertInstanceOf(GH9109User::class, $user);
self::assertEquals($userLastName, $user->getLastName());

// assert NOT QUOTED will WORK with Criteria
$criteria = Criteria::create();
$criteria->where($criteria->expr()->eq('lastName', $userLastName));
$user = $persistedProduct->getBuyers()->matching($criteria)->first();
self::assertInstanceOf(GH9109User::class, $user);
self::assertEquals($userLastName, $user->getLastName());

// assert QUOTED will WORK with findOneBy
$user = $userRepository->findOneBy(['firstName' => $userFirstName]);
self::assertInstanceOf(GH9109User::class, $user);
self::assertEquals($userFirstName, $user->getFirstName());

// assert QUOTED will WORK with Criteria
$criteria = Criteria::create();
$criteria->where($criteria->expr()->eq('firstName', $userFirstName));
$user = $persistedProduct->getBuyers()->matching($criteria)->first();
self::assertInstanceOf(GH9109User::class, $user);
self::assertEquals($userFirstName, $user->getFirstName());
}
}

/**
* @Entity
*/
class GH9109Product
{
/**
* @var int $id
* @Column(name="`id`", type="integer")
* @Id
* @GeneratedValue(strategy="AUTO")
*/
private $id;

/**
* @var string $title
* @Column(name="`title`", type="string", length=255)
*/
private $title;

/**
* @var Collection|GH9109User[]
* @psalm-var Collection<int, GH9109User>
* @ManyToMany(targetEntity="GH9109User")
*/
private $buyers;

public function __construct()
{
$this->buyers = new ArrayCollection();
}

public function getId(): int
{
return $this->id;
}

public function setTitle(string $title): void
{
$this->title = $title;
}

public function getTitle(): string
{
return $this->title;
}

/**
* @psalm-return Collection<int, GH9109User>
*/
public function getBuyers(): Collection
{
return $this->buyers;
}

public function addBuyer(GH9109User $buyer): void
{
$this->buyers[] = $buyer;
}
}

/**
* @Entity
*/
class GH9109User
{
/**
* @var int
* @Column(name="`id`", type="integer")
* @Id
* @GeneratedValue(strategy="AUTO")
*/
private $id;

/**
* @var string
* @Column(name="`first_name`", type="string")
*/
private $firstName;

/**
* @var string
* @Column(name="last_name", type="string")
*/
private $lastName;

public function getId(): int
{
return $this->id;
}

public function getFirstName(): string
{
return $this->firstName;
}

public function setFirstName(string $firstName): void
{
$this->firstName = $firstName;
}

public function getLastName(): string
{
return $this->lastName;
}

public function setLastName(string $lastName): void
{
$this->lastName = $lastName;
}
}