Fix bug when a JTI parent had children fields (#65)

Co-authored-by: Maxim Smakouz <m.smakouz@gmail.com>

Author: meekstellar

composer.json

@@ -8,7 +8,7 @@
     "require": {
         "php": ">=8.0",
         "cycle/orm": "^2.2.0",
-        "cycle/schema-builder": "^2.2",
+        "cycle/schema-builder": "^2.3",
         "doctrine/annotations": "^1.13 || ^2.0",
         "spiral/attributes": "^2.8|^3.0",
         "spiral/tokenizer": "^2.8|^3.0",

src/Entities.php

@@ -81,7 +81,7 @@ public function run(Registry $registry): Registry
         }
 
         foreach ($children as $e) {
-            $registry->registerChild($registry->getEntity($this->utils->findParent($e->getClass())), $e);
+            $registry->registerChildWithoutMerge($registry->getEntity($this->utils->findParent($e->getClass())), $e);
         }
 
         return $this->normalizeNames($registry);
@@ -157,7 +157,7 @@ private function resolveTarget(Registry $registry, string $name): ?string
             return $name;
         }
 
-        if (! $registry->hasEntity($name)) {
+        if (!$registry->hasEntity($name)) {
             // point all relations to the parent
             foreach ($registry as $entity) {
                 foreach ($registry->getChildren($entity) as $child) {

src/TableInheritance.php

@@ -133,6 +133,8 @@ private function initInheritance(
                 $parent->getInheritance()->setDiscriminator($annotation->getName());
             }
 
+            $parent->merge($entity);
+
             return $parent;
         }
         if ($inheritance instanceof Inheritance\JoinedTable) {

tests/Annotated/Fixtures/Fixtures21/Buyer.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures21;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+use Cycle\Annotated\Annotation\Inheritance\JoinedTable;
+
+/**
+ * @Entity
+ * @JoinedTable
+ */
+#[Entity]
+#[JoinedTable]
+class Buyer extends Person
+{
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    public string $foo;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    public string $bar;
+}

tests/Annotated/Fixtures/Fixtures21/Employee.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures21;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+use Cycle\Annotated\Annotation\Inheritance\JoinedTable;
+
+/**
+ * @Entity
+ * @JoinedTable
+ */
+#[Entity]
+#[JoinedTable]
+class Employee extends Person
+{
+    /** @Column(type="integer") */
+    #[Column(type: 'integer')]
+    public int $salary;
+}

tests/Annotated/Fixtures/Fixtures21/Executive.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures21;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+use Cycle\Annotated\Annotation\Inheritance\JoinedTable;
+
+/**
+ * @Entity
+ * @JoinedTable
+ */
+#[Entity]
+#[JoinedTable]
+class Executive extends Employee
+{
+    /** @Column(type="integer") */
+    #[Column(type: 'integer')]
+    public int $bonus;
+}

tests/Annotated/Fixtures/Fixtures21/Person.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures21;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+
+/**
+ * @Entity
+ */
+#[Entity]
+class Person
+{
+    /** @Column(type="primary") */
+    #[Column(type: 'primary')]
+    protected int $id;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    public string $name;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    public string $type;
+}

tests/Annotated/Functional/Driver/Common/Inheritance/JoinedTableTest.php

@@ -16,6 +16,7 @@
 use Cycle\Database\Schema\AbstractIndex;
 use Cycle\ORM\EntityManager;
 use Cycle\ORM\Schema;
+use Cycle\ORM\SchemaInterface;
 use Cycle\Schema\Compiler;
 use Cycle\Schema\Generator\GenerateRelations;
 use Cycle\Schema\Generator\GenerateTypecast;
@@ -192,11 +193,30 @@ public function testAddIndex(ReaderInterface $reader): void
         $this->assertTrue(end($indexes)->isUnique());
     }
 
-    private function compile(ReaderInterface $reader): array
+    /**
+     * @dataProvider allReadersProvider
+     */
+    public function testJtiParentColumns(ReaderInterface $reader): void
+    {
+        $schema = $this->compile($reader, 'Fixtures21');
+
+        $this->assertNotEmpty($schema);
+
+        $this->assertArrayHasKey(SchemaInterface::COLUMNS, $schema['person']);
+
+        // assert that parent doesn't have jti columns
+        $this->assertSame([
+            'id' => 'id',
+            'name' => 'name',
+            'type' => 'type',
+        ], $schema['person'][SchemaInterface::COLUMNS]);
+    }
+
+    private function compile(ReaderInterface $reader, string $fixtures = 'Fixtures16'): array
     {
         $tokenizer = new Tokenizer(
             new TokenizerConfig([
-                'directories' => [__DIR__ . '/../../../../Fixtures/Fixtures16'],
+                'directories' => [sprintf(__DIR__ . '/../../../../Fixtures/%s', $fixtures)],
                 'exclude' => [],
             ])
         );