Merge pull request #154 from homersimpsons/fix/singular-getter-one-to-one

OneToOne inverse relation: singular getter name

Author: moufmouf

src/Utils/DirectForeignKeyMethodDescriptor.php

@@ -74,9 +74,9 @@ public function __construct(
     public function getName() : string
     {
         if (!$this->useAlternateName) {
-            return 'get'.TDBMDaoGenerator::toCamelCase($this->foreignKey->getLocalTableName());
+            return 'get' . $this->getPropertyName();
         } else {
-            $methodName = 'get'.TDBMDaoGenerator::toCamelCase($this->foreignKey->getLocalTableName()).'By';
+            $methodName = 'get' . $this->getPropertyName() . 'By';
 
             $camelizedColumns = array_map([TDBMDaoGenerator::class, 'toCamelCase'], $this->foreignKey->getUnquotedLocalColumns());
 
@@ -86,6 +86,20 @@ public function getName() : string
         }
     }
 
+    /**
+     * Returns the property name in CamelCase taking into account singularization
+     *
+     * @return string
+     */
+    private function getPropertyName() : string
+    {
+        $name = $this->foreignKey->getLocalTableName();
+        if ($this->hasLocalUniqueIndex()) {
+            $name = TDBMDaoGenerator::toSingular($name);
+        }
+        return TDBMDaoGenerator::toCamelCase($name);
+    }
+
     /**
      * Returns the name of the class that will be returned by the getter (short name).
      *
@@ -170,22 +184,28 @@ private function getFilters(ForeignKeyConstraint $fk) : string
         return $parametersCode;
     }
 
+    private $hasLocalUniqueIndex;
     /**
      * Check if the ForeignKey have an unique index
      *
      * @return bool
      */
     private function hasLocalUniqueIndex(): bool
     {
+        if ($this->hasLocalUniqueIndex !== null) {
+            return $this->hasLocalUniqueIndex;
+        }
         foreach ($this->getForeignKey()->getLocalTable()->getIndexes() as $index) {
             if (
                 $index->isUnique()
                 && count($index->getUnquotedColumns()) === count($this->getForeignKey()->getUnquotedLocalColumns())
                 && !array_diff($index->getUnquotedColumns(), $this->getForeignKey()->getUnquotedLocalColumns()) // Check for permuted columns too
             ) {
+                $this->hasLocalUniqueIndex = true;
                 return true;
             }
         }
+        $this->hasLocalUniqueIndex = false;
         return false;
     }
 
@@ -222,7 +242,7 @@ public function getJsonSerializeCode() : string
             $format = "jsonSerialize($stopRecursion)";
         }
         $isIncluded = $this->findAnnotation(Annotation\JsonInclude::class) !== null;
-        $index = $jsonCollection->key ?: lcfirst(TDBMDaoGenerator::toCamelCase($this->foreignKey->getLocalTableName()));
+        $index = $jsonCollection->key ?: lcfirst($this->getPropertyName());
         $class = $this->getBeanClassName();
         $variableName = '$' . TDBMDaoGenerator::toVariableName($class);
         $getter = $this->getName();

tests/TDBMAbstractServiceTest.php

@@ -437,12 +437,12 @@ private static function initSchema(Connection $connection): void
             ->column('track_id')->references('tracks')
             ->column('artist_id')->references('artists')->comment('@JsonKey("feat") @JsonInclude');
 
-        $db->table('object_base')
+        $db->table('base_objects')
             ->column('id')->integer()->primaryKey()->autoIncrement()
             ->column('label')->string();
-        $db->table('object_inherited')
+        $db->table('inherited_objects')
             ->column('id')->integer()->primaryKey()->autoIncrement()
-            ->column('object_base_id')->references('object_base')->unique()->comment('@JsonCollection');
+            ->column('base_object_id')->references('base_objects')->unique()->comment('@JsonCollection');
 
         $sqlStmts = $toSchema->getMigrateFromSql($fromSchema, $connection->getDatabasePlatform());
 

tests/TDBMDaoGeneratorTest.php

@@ -40,27 +40,26 @@
 use TheCodingMachine\TDBM\Test\Dao\AllNullableDao;
 use TheCodingMachine\TDBM\Test\Dao\AnimalDao;
 use TheCodingMachine\TDBM\Test\Dao\ArtistDao;
+use TheCodingMachine\TDBM\Test\Dao\BaseObjectDao;
 use TheCodingMachine\TDBM\Test\Dao\Bean\AccountBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\AllNullableBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\AnimalBean;
-use TheCodingMachine\TDBM\Test\Dao\Bean\ArrayBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\Article2Bean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\ArticleBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\ArtistBean;
+use TheCodingMachine\TDBM\Test\Dao\Bean\BaseObjectBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\BoatBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CatBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CategoryBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\CountryBean;
-use TheCodingMachine\TDBM\Test\Dao\Bean\DateArrayBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\DogBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\FileBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\Generated\ArticleBaseBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\Generated\BoatBaseBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\Generated\FileBaseBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\Generated\UserBaseBean;
+use TheCodingMachine\TDBM\Test\Dao\Bean\InheritedObjectBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\NodeBean;
-use TheCodingMachine\TDBM\Test\Dao\Bean\ObjectBaseBean;
-use TheCodingMachine\TDBM\Test\Dao\Bean\ObjectInheritedBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\PersonBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\RefNoPrimKeyBean;
 use TheCodingMachine\TDBM\Test\Dao\Bean\RoleBean;
@@ -73,11 +72,9 @@
 use TheCodingMachine\TDBM\Test\Dao\CountryDao;
 use TheCodingMachine\TDBM\Test\Dao\DogDao;
 use TheCodingMachine\TDBM\Test\Dao\FileDao;
-use TheCodingMachine\TDBM\Test\Dao\Generated\ContactBaseDao;
 use TheCodingMachine\TDBM\Test\Dao\Generated\UserBaseDao;
+use TheCodingMachine\TDBM\Test\Dao\InheritedObjectDao;
 use TheCodingMachine\TDBM\Test\Dao\NodeDao;
-use TheCodingMachine\TDBM\Test\Dao\ObjectBaseDao;
-use TheCodingMachine\TDBM\Test\Dao\ObjectInheritedDao;
 use TheCodingMachine\TDBM\Test\Dao\RefNoPrimKeyDao;
 use TheCodingMachine\TDBM\Test\Dao\RoleDao;
 use TheCodingMachine\TDBM\Test\Dao\StateDao;
@@ -2098,14 +2095,14 @@ public function testLazyLoad(): void
      */
     public function testOneToOneInverseRelationGetter(): void
     {
-        $objectBaseDao = new ObjectBaseDao($this->tdbmService);
-        $objectInheritedDao = new ObjectInheritedDao($this->tdbmService);
-        $objectBase = new ObjectBaseBean('label');
+        $objectBaseDao = new BaseObjectDao($this->tdbmService);
+        $objectInheritedDao = new InheritedObjectDao($this->tdbmService);
+        $objectBase = new BaseObjectBean('label');
         $objectBaseDao->save($objectBase);
-        $this->assertNull($objectBase->getObjectInherited());
-        $objectInherited = new ObjectInheritedBean($objectBase);
+        $this->assertNull($objectBase->getInheritedObject());
+        $objectInherited = new InheritedObjectBean($objectBase);
         $objectInheritedDao->save($objectInherited);
-        $this->assertSame($objectInherited, $objectBase->getObjectInherited());
-        $this->assertEquals(1, $objectBase->jsonSerialize()['objectInherited']['id']);
+        $this->assertSame($objectInherited, $objectBase->getInheritedObject());
+        $this->assertEquals(1, $objectBase->jsonSerialize()['inheritedObject']['id']);
     }
 }