IBX-6824: Fixed inheritance column reported as invalid

ibexa · Oct 18, 2023 · a9d2b50 · a9d2b50
1 parent 64b6488
commit a9d2b50
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/lib/Gateway/ExpressionVisitor.php b/src/lib/Gateway/ExpressionVisitor.php
@@ -123,7 +123,7 @@ public function walkComparison(Comparison $comparison)
             return $this->handleTranslation($comparison);
         }
 
-        if (!$this->schemaMetadata->hasColumn($column)) {
+        if (!$this->schemaMetadata->hasColumn($column) && !$this->schemaMetadata->isInheritedColumn($column)) {
             throw new RuntimeMappingException(sprintf(
                 '%s table metadata does not contain %s column.',
                 $this->schemaMetadata->getTableName(),

diff --git a/tests/bundle/Gateway/ExpressionVisitorTest.php b/tests/bundle/Gateway/ExpressionVisitorTest.php
@@ -252,6 +252,33 @@ public function testFieldFromInheritedRelationship(): void
         );
     }
 
+    public function testFieldFromSubclass(): void
+    {
+        $this->schemaMetadata
+            ->expects(self::exactly(2))
+            ->method('isInheritedColumn')
+            ->with('inherited_field')
+            ->willReturn(true);
+
+        $inheritanceMetadata = $this->createMock(DoctrineSchemaMetadataInterface::class);
+        $this->schemaMetadata
+            ->expects(self::once())
+            ->method('getInheritanceMetadataWithColumn')
+            ->with('inherited_field')
+            ->willReturn($inheritanceMetadata);
+
+        $inheritanceMetadata
+            ->expects(self::once())
+            ->method('getTableName')
+            ->willReturn('inheritance_table');
+
+        $result = $this->expressionVisitor->dispatch(new Comparison('inherited_field', '=', 'value'));
+        self::assertSame(
+            'inheritance_table.inherited_field = :inherited_field_0',
+            $result,
+        );
+    }
+
     private function createRelationshipSchemaMetadata(): DoctrineSchemaMetadataInterface
     {
         $relationshipMetadata = $this->createMock(DoctrineSchemaMetadataInterface::class);