fix: missing unique for self-referencing relations (#395)

api-platform · Oct 6, 2022 · a5c0082 · a5c0082
1 parent f737d78
commit a5c0082
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.1.1
+
+* fix: missing unique for self-referencing relations
+
 ## 5.1.0
 
 * feat: repeatable attributes support

diff --git a/src/AttributeGenerator/DoctrineOrmAttributeGenerator.php b/src/AttributeGenerator/DoctrineOrmAttributeGenerator.php
@@ -213,7 +213,7 @@ public function generatePropertyAttributes(Property $property, string $className
                 $attributes[] = new Attribute('ORM\JoinTable', ['name' => $relationTableName]);
                 // Self-referencing relation
                 if ($className === $property->reference->name()) {
-                    $attributes[] = new Attribute('ORM\InverseJoinColumn', ['name' => $this->generateIdentifierName($this->inflector->singularize($property->name())[0].ucfirst($property->reference->name()).'Id', 'inverse_join_column', $this->config)]);
+                    $attributes[] = new Attribute('ORM\InverseJoinColumn', ['name' => $this->generateIdentifierName($this->inflector->singularize($property->name())[0].ucfirst($property->reference->name()).'Id', 'inverse_join_column', $this->config), 'unique' => true]);
                 } else {
                     $attributes[] = new Attribute('ORM\InverseJoinColumn', ['unique' => true]);
                 }
@@ -227,7 +227,7 @@ public function generatePropertyAttributes(Property $property, string $className
                 $attributes[] = new Attribute('ORM\JoinTable', ['name' => $relationTableName]);
                 // Self-referencing relation
                 if ($className === $property->reference->name()) {
-                    $attributes[] = new Attribute('ORM\InverseJoinColumn', ['name' => $this->generateIdentifierName($this->inflector->singularize($property->name())[0].ucfirst($property->reference->name()).'Id', 'inverse_join_column', $this->config), 'nullable' => false]);
+                    $attributes[] = new Attribute('ORM\InverseJoinColumn', ['name' => $this->generateIdentifierName($this->inflector->singularize($property->name())[0].ucfirst($property->reference->name()).'Id', 'inverse_join_column', $this->config), 'nullable' => false, 'unique' => true]);
                 } else {
                     $attributes[] = new Attribute('ORM\InverseJoinColumn', ['nullable' => false, 'unique' => true]);
                 }

diff --git a/tests/AttributeGenerator/DoctrineOrmAttributeGeneratorTest.php b/tests/AttributeGenerator/DoctrineOrmAttributeGeneratorTest.php
@@ -238,7 +238,7 @@ public function testGeneratePropertyAttributes(): void
             $this->generator->generatePropertyAttributes($this->classMap['Vehicle']->getPropertyByName('relation1_N'), 'Vehicle')
         );
         $this->assertEquals(
-            [new Attribute('ORM\ManyToMany', ['targetEntity' => 'App\Entity\Vehicle']), new Attribute('ORM\JoinTable', ['name' => 'vehicle_vehicle_relation1_n_self_referencing']), new Attribute('ORM\InverseJoinColumn', ['name' => 'relation1_n_self_referencing_vehicle_id', 'nullable' => false])],
+            [new Attribute('ORM\ManyToMany', ['targetEntity' => 'App\Entity\Vehicle']), new Attribute('ORM\JoinTable', ['name' => 'vehicle_vehicle_relation1_n_self_referencing']), new Attribute('ORM\InverseJoinColumn', ['name' => 'relation1_n_self_referencing_vehicle_id', 'nullable' => false, 'unique' => true])],
             $this->generator->generatePropertyAttributes($this->classMap['Vehicle']->getPropertyByName('relation1_N_self_referencing'), 'Vehicle')
         );
         $this->assertEquals(

diff --git a/tests/e2e/customized/App/Schema/Entity/Person.php b/tests/e2e/customized/App/Schema/Entity/Person.php
@@ -139,7 +139,7 @@ class Person extends MyCustomClass implements MyCustomInterface
      */
     #[ORM\ManyToMany(targetEntity: 'App\Schema\Entity\Person')]
     #[ORM\JoinTable(name: 'person_person_siblings')]
-    #[ORM\InverseJoinColumn(name: 'sibling_person_id')]
+    #[ORM\InverseJoinColumn(name: 'sibling_person_id', unique: true)]
     #[ApiProperty(types: ['https://schema.org/siblings'])]
     private ?Collection $siblings = null;
 

diff --git a/tests/e2e/original/App/Schema/Entity/Person.php b/tests/e2e/original/App/Schema/Entity/Person.php
@@ -130,7 +130,7 @@ class Person extends Thing
      */
     #[ORM\ManyToMany(targetEntity: 'App\Schema\Entity\Person')]
     #[ORM\JoinTable(name: 'person_person_siblings')]
-    #[ORM\InverseJoinColumn(name: 'sibling_person_id')]
+    #[ORM\InverseJoinColumn(name: 'sibling_person_id', unique: true)]
     #[ApiProperty(types: ['https://schema.org/siblings'])]
     private ?Collection $siblings = null;