-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 3.0.x: Revert "Merge pull request #11229 from greg0ire/add-columns" Add columns for 3.1.x and 4.0x Update version ORM from 2 to 3 in docs (#11221) Clean up outdated sentence (#11224) Update README.md Point link to correct upgrade guide (#11220) Ignore subclasses without discriminatorValue when generating discriminator column condition SQL (#11200) Update branches in README
- Loading branch information
Showing
5 changed files
with
115 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Doctrine\Tests\ORM\Functional\Ticket; | ||
|
|
||
| use Doctrine\ORM\Mapping as ORM; | ||
| use Doctrine\Tests\OrmFunctionalTestCase; | ||
| use Generator; | ||
| use PHPUnit\Framework\Attributes\DataProvider; | ||
|
|
||
| class GH11199Test extends OrmFunctionalTestCase | ||
| { | ||
| protected function setUp(): void | ||
| { | ||
| parent::setUp(); | ||
|
|
||
| $this->setUpEntitySchema([ | ||
| GH11199Root::class, | ||
| GH11199Parent::class, | ||
| GH11199Foo::class, | ||
| GH11199Baz::class, | ||
| GH11199AbstractLeaf::class, | ||
| ]); | ||
| } | ||
|
|
||
| public static function dqlStatements(): Generator | ||
| { | ||
| yield ['SELECT e FROM ' . GH11199Root::class . ' e', "/WHERE g0_.asset_type IN \('root', 'foo', 'baz'\)$/"]; | ||
| yield ['SELECT e FROM ' . GH11199Parent::class . ' e', "/WHERE g0_.asset_type IN \('foo'\)$/"]; | ||
| yield ['SELECT e FROM ' . GH11199Foo::class . ' e', "/WHERE g0_.asset_type IN \('foo'\)$/"]; | ||
| yield ['SELECT e FROM ' . GH11199Baz::class . ' e', "/WHERE g0_.asset_type IN \('baz'\)$/"]; | ||
| yield ['SELECT e FROM ' . GH11199AbstractLeaf::class . ' e', '/WHERE 1=0/']; | ||
| } | ||
|
|
||
| #[DataProvider('dqlStatements')] | ||
| public function testGH11199(string $dql, string $expectedDiscriminatorValues): void | ||
| { | ||
| $query = $this->_em->createQuery($dql); | ||
| $sql = $query->getSQL(); | ||
|
|
||
| self::assertMatchesRegularExpression($expectedDiscriminatorValues, $sql); | ||
| } | ||
| } | ||
|
|
||
| #[ORM\Entity] | ||
| #[ORM\Table(name: 'gh11199')] | ||
| #[ORM\InheritanceType('SINGLE_TABLE')] | ||
| #[ORM\DiscriminatorColumn(name: 'asset_type', type: 'string')] | ||
| #[ORM\DiscriminatorMap([ | ||
| 'root' => GH11199Root::class, | ||
| 'foo' => GH11199Foo::class, | ||
| 'baz' => GH11199Baz::class, | ||
| ])] | ||
| class GH11199Root | ||
| { | ||
| #[ORM\Id] | ||
| #[ORM\GeneratedValue(strategy: 'IDENTITY')] | ||
| #[ORM\Column(type: 'integer')] | ||
| private int|null $id = null; | ||
| } | ||
|
|
||
| #[ORM\Entity] | ||
| abstract class GH11199Parent extends GH11199Root | ||
| { | ||
| } | ||
|
|
||
| #[ORM\Entity] | ||
| class GH11199Foo extends GH11199Parent | ||
| { | ||
| } | ||
|
|
||
| #[ORM\Entity] | ||
| class GH11199Baz extends GH11199Root | ||
| { | ||
| } | ||
|
|
||
| #[ORM\Entity] | ||
| abstract class GH11199AbstractLeaf extends GH11199Root | ||
| { | ||
| } |