better conflict test

Author: Kharhamel

tests/TDBMAbstractServiceTest.php

@@ -416,7 +416,7 @@ private static function initSchema(Connection $connection): void
 
         $db->table('artists')
             ->column('id')->integer()->primaryKey()->autoIncrement()
-            ->column('children')->array()->null()
+            ->column('children')->array()->null() //used to test conflicts with autopivot
             ->column('name')->string();
 
         $db->table('albums')
@@ -438,11 +438,15 @@ private static function initSchema(Connection $connection): void
             ->column('track_id')->references('tracks')
             ->column('artist_id')->references('artists')->comment('@JsonKey("feat") @JsonInclude');
 
-        $db->table('artists_relations')
+        $db->table('artists_relations') //used to test the auto pivot case
             ->column('id')->integer()->primaryKey()->autoIncrement()
             ->column('parent_id')->references('artists')
             ->column('child_id')->references('artists');
 
+        $db->table('children') //used to test conflicts with autopivot
+            ->column('id')->integer()->primaryKey()->autoIncrement()
+            ->column('artist_id')->references('artists');
+
         $db->junctionTable('person', 'boats');
 
         $db->table('base_objects')

tests/TDBMDaoGeneratorTest.php

@@ -2164,8 +2164,9 @@ public function testLazyStopRecursionOnCompositeForeignKey(): void
     public function testMethodNameConflictsBetweenRegularAndAutoPivotProperties()
     {
         $artist = new ArtistBean('Super');
-        $artist->getChildren();
-        $artist->getChildrenByArtistsRelations();
+        $artist->getChildren(); // regular property
+        $artist->getChildrenByArtistId(); // one-to-may relationship
+        $artist->getChildrenByArtistsRelations(); // auto-pivot relationship
         $this->assertEquals(1, 1);
     }
 }