Merge pull request #11456 from prohalexey/IntegerDescriminatorInInsta…

…nceOf Using an integer as discriminator value with ORM v3
doctrine · May 17, 2024 · daa99f1 · daa99f1
2 parents 3d9af31 + 2b04cc2
commit daa99f1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/src/Query/SqlWalker.php b/src/Query/SqlWalker.php
@@ -2251,8 +2251,10 @@ private function getChildDiscriminatorsFromClassMetadata(
             $discriminators += HierarchyDiscriminatorResolver::resolveDiscriminatorsForClass($metadata, $this->em);
         }
 
-        foreach (array_keys($discriminators) as $dis) {
-            $sqlParameterList[] = $this->conn->quote($dis);
+        foreach (array_keys($discriminators) as $discriminatorValue) {
+            $sqlParameterList[] = $rootClass->getDiscriminatorColumn()->type === 'integer' && is_int($discriminatorValue)
+                ? $discriminatorValue
+                : $this->conn->quote((string) $discriminatorValue);
         }
 
         return '(' . implode(', ', $sqlParameterList) . ')';

diff --git a/tests/Tests/ORM/Functional/Ticket/GH11341Test.php b/tests/Tests/ORM/Functional/Ticket/GH11341Test.php
@@ -49,6 +49,32 @@ public function testDiscriminatorValue(string $dql, string $expectedDiscriminato
 
         self::assertMatchesRegularExpression($expectedDiscriminatorValues, $sql);
     }
+
+    public static function dqlStatementsForInstanceOf(): Generator
+    {
+        yield [IntegerBaseClass::class, IntegerFooEntity::class];
+        yield [StringBaseClass::class, StringFooEntity::class];
+        yield [StringAsIntBaseClass::class, StringAsIntFooEntity::class];
+    }
+
+    /**
+     * @psalm-param class-string $baseClass
+     * @psalm-param class-string $inheritedClass
+     */
+    #[DataProvider('dqlStatementsForInstanceOf')]
+    public function testInstanceOf(string $baseClass, string $inheritedClass): void
+    {
+        $this->_em->persist(new $inheritedClass());
+        $this->_em->flush();
+
+        $dql = 'SELECT p FROM ' . $baseClass . ' p WHERE p INSTANCE OF ' . $baseClass;
+
+        $query  = $this->_em->createQuery($dql);
+        $result = $query->getResult();
+
+        self::assertCount(1, $result);
+        self::assertContainsOnlyInstancesOf($baseClass, $result);
+    }
 }
 
 #[ORM\Entity]