Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OneToOne inverse getter #151

Merged
merged 4 commits into from
Jul 18, 2019
+100 −20
Merged

OneToOne inverse getter #151

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
badd068
One To One inverse index test, Prefer unique index over non unique one
homersimpsons Jul 18, 2019
653773d
One To One inverse index: implementation
homersimpsons Jul 18, 2019
301515c
One To One inverse index
homersimpsons Jul 18, 2019
ec64197
One To One inverse index: Use UnquotedColumns
homersimpsons Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
One To One inverse index test, Prefer unique index over non unique one
@homersimpsons
homersimpsons committed Jul 18, 2019
commit badd06811a275cbb14e802d9ec1745b1a4ab2c25
6 changes: 5 additions & 1 deletion src/Utils/BeanDescriptor.php
View file
Original file line number Diff line number Diff line change
@@ -1119,7 +1119,11 @@ private function removeDuplicateIndexes(array $indexes): array
{
$indexesByKey = [];
foreach ($indexes as $index) {
$indexesByKey[implode('__`__', $index->getUnquotedColumns())] = $index;
$key = implode('__`__', $index->getUnquotedColumns());
// Unique Index have precedence over non unique one
if (!isset($indexesByKey[$key]) || $index->isUnique()) {
$indexesByKey[$key] = $index;
}
}

return array_values($indexesByKey);
6 changes: 6 additions & 0 deletions tests/TDBMAbstractServiceTest.php
View file
Original file line number Diff line number Diff line change
@@ -437,6 +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')
->column('id')->integer()->primaryKey()->autoIncrement();
$db->table('object_inherited')
->column('id')->integer()->primaryKey()->autoIncrement()
->column('object_base_id')->references('object_base')->unique();

$sqlStmts = $toSchema->getMigrateFromSql($fromSchema, $connection->getDatabasePlatform());

foreach ($sqlStmts as $sqlStmt) {
16 changes: 16 additions & 0 deletions tests/TDBMDaoGeneratorTest.php
View file
Original file line number Diff line number Diff line change
@@ -59,6 +59,8 @@
use TheCodingMachine\TDBM\Test\Dao\Bean\Generated\FileBaseBean;
use TheCodingMachine\TDBM\Test\Dao\Bean\Generated\UserBaseBean;
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;
@@ -74,6 +76,8 @@
use TheCodingMachine\TDBM\Test\Dao\Generated\ContactBaseDao;
use TheCodingMachine\TDBM\Test\Dao\Generated\UserBaseDao;
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;
@@ -2074,4 +2078,16 @@ public function testLazyLoad(): void
$roleBean->getId();
$this->assertSame(TDBMObjectStateEnum::STATE_NOT_LOADED, $roleBean->_getDbRows()['roles']->_getStatus());
}

public function testOneToOneInverseRelationGetter(): void
{
$objectBaseDao = new ObjectBaseDao($this->tdbmService);
$objectInheritedDao = new ObjectInheritedDao($this->tdbmService);
$objectBase = new ObjectBaseBean();
$objectBaseDao->save($objectBase);
$this->assertNull($objectBase->getObjectInherited());
$objectInherited = new ObjectInheritedBean($objectBase);
$objectInheritedDao->save($objectInherited);
$this->assertInstanceOf(ObjectInheritedBean::class, $objectBase->getObjectInherited());
}
}