getphred/Pairity
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix MySQL tests
Some checks are pending
CI / test (8.1) (push) Waiting to run
Details
CI / test (8.2) (push) Waiting to run
Details
CI / test (8.3) (push) Waiting to run
Details

Browse source
This commit is contained in:
Funky Waddle 2025-12-11 11:21:43 -06:00
parent 816ce8d973
commit 17ad40b91f
3 changed files with 77 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.phpunit.result.cache
View file

@ -1 +1 @@
{"version":2,"defects":{"Pairity\\Tests\\BelongsToManyMysqlTest::testBelongsToManyEagerAndHelpers":1,"Pairity\\Tests\\BelongsToManySqliteTest::testBelongsToManyEagerAndPivotHelpers":7,"Pairity\\Tests\\CastersAndAccessorsSqliteTest::testCustomCasterAndDtoAccessorsMutators":7,"Pairity\\Tests\\JoinEagerMysqlTest::testJoinEagerHasManyAndBelongsTo":1,"Pairity\\Tests\\JoinEagerSqliteTest::testHasManyJoinEagerWithProjectionAndSoftDeleteScope":7,"Pairity\\Tests\\JoinEagerSqliteTest::testBelongsToJoinEagerSingleLevel":8,"Pairity\\Tests\\MongoAdapterTest::testCrudCycle":1,"Pairity\\Tests\\MongoDaoTest::testCrudViaDao":8,"Pairity\\Tests\\MongoOptimisticLockTest::testVersionIncrementOnUpdate":8,"Pairity\\Tests\\MongoPaginationTest::testPaginateAndSimplePaginateWithScopes":8,"Pairity\\Tests\\MongoRelationsTest::testEagerAndLazyRelations":8,"Pairity\\Tests\\MysqlSmokeTest::testCreateAndDropTable":1,"Pairity\\Tests\\PaginationSqliteTest::testPaginateAndSimplePaginateWithScopesAndRelations":7,"Pairity\\Tests\\RelationsNestedConstraintsSqliteTest::testNestedEagerAndPerRelationFieldsConstraint":7,"Pairity\\Tests\\SchemaBuilderSqliteTest::testCreateAlterDropCycle":8,"Pairity\\Tests\\UnitOfWorkCascadeMongoTest::testDeleteByIdCascadesToChildren":8,"Pairity\\Tests\\UnitOfWorkCascadeSqliteTest::testDeleteByIdCascadesToChildren":7,"Pairity\\Tests\\UnitOfWorkMongoTest::testDeferredUpdateAndDeleteCommit":8,"Pairity\\Tests\\UnitOfWorkMongoTest::testRollbackOnExceptionClearsOps":8,"Pairity\\Tests\\MongoEventSystemTest::testDaoEventsFireOnCrud":8,"Pairity\\Tests\\PostgresSmokeTest::testCreateAlterDropCycle":1},"times":{"Pairity\\Tests\\BelongsToManyMysqlTest::testBelongsToManyEagerAndHelpers":0.001,"Pairity\\Tests\\BelongsToManySqliteTest::testBelongsToManyEagerAndPivotHelpers":0.004,"Pairity\\Tests\\CastersAndAccessorsSqliteTest::testCustomCasterAndDtoAccessorsMutators":0,"Pairity\\Tests\\JoinEagerMysqlTest::testJoinEagerHasManyAndBelongsTo":0,"Pairity\\Tests\\JoinEagerSqliteTest::testHasManyJoinEagerWithProjectionAndSoftDeleteScope":0,"Pairity\\Tests\\JoinEagerSqliteTest::testBelongsToJoinEagerSingleLevel":0,"Pairity\\Tests\\MongoAdapterTest::testCrudCycle":0.002,"Pairity\\Tests\\MongoDaoTest::testCrudViaDao":0.001,"Pairity\\Tests\\MongoOptimisticLockTest::testVersionIncrementOnUpdate":0,"Pairity\\Tests\\MongoPaginationTest::testPaginateAndSimplePaginateWithScopes":0,"Pairity\\Tests\\MongoRelationsTest::testEagerAndLazyRelations":0,"Pairity\\Tests\\MysqlSmokeTest::testCreateAndDropTable":0,"Pairity\\Tests\\OptimisticLockSqliteTest::testVersionLockingIncrementsAndBlocksBulkUpdate":0,"Pairity\\Tests\\PaginationSqliteTest::testPaginateAndSimplePaginateWithScopesAndRelations":0.001,"Pairity\\Tests\\RelationsNestedConstraintsSqliteTest::testNestedEagerAndPerRelationFieldsConstraint":0,"Pairity\\Tests\\SchemaBuilderSqliteTest::testCreateAlterDropCycle":0.002,"Pairity\\Tests\\SoftDeletesTimestampsSqliteTest::testTimestampsAndSoftDeletesFlow":0,"Pairity\\Tests\\UnitOfWorkCascadeMongoTest::testDeleteByIdCascadesToChildren":0,"Pairity\\Tests\\UnitOfWorkCascadeSqliteTest::testDeleteByIdCascadesToChildren":0,"Pairity\\Tests\\UnitOfWorkMongoTest::testDeferredUpdateAndDeleteCommit":0,"Pairity\\Tests\\UnitOfWorkMongoTest::testRollbackOnExceptionClearsOps":0,"Pairity\\Tests\\UnitOfWorkSqliteTest::testDeferredUpdateAndDeleteCommit":0,"Pairity\\Tests\\UnitOfWorkSqliteTest::testRollbackOnExceptionClearsOps":0,"Pairity\\Tests\\EventSystemSqliteTest::testDaoEventsForInsertUpdateDeleteAndFind":0,"Pairity\\Tests\\EventSystemSqliteTest::testUowBeforeAfterCommitEvents":0,"Pairity\\Tests\\MongoEventSystemTest::testDaoEventsFireOnCrud":0,"Pairity\\Tests\\PostgresSmokeTest::testCreateAlterDropCycle":0}} {"version":2,"defects":{"Pairity\\Tests\\BelongsToManyMysqlTest::testBelongsToManyEagerAndHelpers":1,"Pairity\\Tests\\BelongsToManySqliteTest::testBelongsToManyEagerAndPivotHelpers":7,"Pairity\\Tests\\CastersAndAccessorsSqliteTest::testCustomCasterAndDtoAccessorsMutators":7,"Pairity\\Tests\\JoinEagerMysqlTest::testJoinEagerHasManyAndBelongsTo":1,"Pairity\\Tests\\JoinEagerSqliteTest::testHasManyJoinEagerWithProjectionAndSoftDeleteScope":7,"Pairity\\Tests\\JoinEagerSqliteTest::testBelongsToJoinEagerSingleLevel":8,"Pairity\\Tests\\MongoAdapterTest::testCrudCycle":1,"Pairity\\Tests\\MongoDaoTest::testCrudViaDao":8,"Pairity\\Tests\\MongoOptimisticLockTest::testVersionIncrementOnUpdate":8,"Pairity\\Tests\\MongoPaginationTest::testPaginateAndSimplePaginateWithScopes":8,"Pairity\\Tests\\MongoRelationsTest::testEagerAndLazyRelations":8,"Pairity\\Tests\\MysqlSmokeTest::testCreateAndDropTable":1,"Pairity\\Tests\\PaginationSqliteTest::testPaginateAndSimplePaginateWithScopesAndRelations":7,"Pairity\\Tests\\RelationsNestedConstraintsSqliteTest::testNestedEagerAndPerRelationFieldsConstraint":7,"Pairity\\Tests\\SchemaBuilderSqliteTest::testCreateAlterDropCycle":8,"Pairity\\Tests\\UnitOfWorkCascadeMongoTest::testDeleteByIdCascadesToChildren":8,"Pairity\\Tests\\UnitOfWorkCascadeSqliteTest::testDeleteByIdCascadesToChildren":7,"Pairity\\Tests\\UnitOfWorkMongoTest::testDeferredUpdateAndDeleteCommit":8,"Pairity\\Tests\\UnitOfWorkMongoTest::testRollbackOnExceptionClearsOps":8,"Pairity\\Tests\\MongoEventSystemTest::testDaoEventsFireOnCrud":8,"Pairity\\Tests\\PostgresSmokeTest::testCreateAlterDropCycle":1},"times":{"Pairity\\Tests\\BelongsToManyMysqlTest::testBelongsToManyEagerAndHelpers":0.001,"Pairity\\Tests\\BelongsToManySqliteTest::testBelongsToManyEagerAndPivotHelpers":0.004,"Pairity\\Tests\\CastersAndAccessorsSqliteTest::testCustomCasterAndDtoAccessorsMutators":0,"Pairity\\Tests\\JoinEagerMysqlTest::testJoinEagerHasManyAndBelongsTo":0,"Pairity\\Tests\\JoinEagerSqliteTest::testHasManyJoinEagerWithProjectionAndSoftDeleteScope":0,"Pairity\\Tests\\JoinEagerSqliteTest::testBelongsToJoinEagerSingleLevel":0,"Pairity\\Tests\\MongoAdapterTest::testCrudCycle":0.002,"Pairity\\Tests\\MongoDaoTest::testCrudViaDao":0.001,"Pairity\\Tests\\MongoOptimisticLockTest::testVersionIncrementOnUpdate":0,"Pairity\\Tests\\MongoPaginationTest::testPaginateAndSimplePaginateWithScopes":0,"Pairity\\Tests\\MongoRelationsTest::testEagerAndLazyRelations":0,"Pairity\\Tests\\MysqlSmokeTest::testCreateAndDropTable":0,"Pairity\\Tests\\OptimisticLockSqliteTest::testVersionLockingIncrementsAndBlocksBulkUpdate":0,"Pairity\\Tests\\PaginationSqliteTest::testPaginateAndSimplePaginateWithScopesAndRelations":0.001,"Pairity\\Tests\\RelationsNestedConstraintsSqliteTest::testNestedEagerAndPerRelationFieldsConstraint":0,"Pairity\\Tests\\SchemaBuilderSqliteTest::testCreateAlterDropCycle":0.001,"Pairity\\Tests\\SoftDeletesTimestampsSqliteTest::testTimestampsAndSoftDeletesFlow":0,"Pairity\\Tests\\UnitOfWorkCascadeMongoTest::testDeleteByIdCascadesToChildren":0,"Pairity\\Tests\\UnitOfWorkCascadeSqliteTest::testDeleteByIdCascadesToChildren":0,"Pairity\\Tests\\UnitOfWorkMongoTest::testDeferredUpdateAndDeleteCommit":0,"Pairity\\Tests\\UnitOfWorkMongoTest::testRollbackOnExceptionClearsOps":0,"Pairity\\Tests\\UnitOfWorkSqliteTest::testDeferredUpdateAndDeleteCommit":0,"Pairity\\Tests\\UnitOfWorkSqliteTest::testRollbackOnExceptionClearsOps":0,"Pairity\\Tests\\EventSystemSqliteTest::testDaoEventsForInsertUpdateDeleteAndFind":0,"Pairity\\Tests\\EventSystemSqliteTest::testUowBeforeAfterCommitEvents":0,"Pairity\\Tests\\MongoEventSystemTest::testDaoEventsFireOnCrud":0,"Pairity\\Tests\\PostgresSmokeTest::testCreateAlterDropCycle":0}}

41
tests/BelongsToManyMysqlTest.php
View file

@ -52,26 +52,26 @@ final class BelongsToManyMysqlTest extends TestCase
$RoleDto = new class([]) extends AbstractDto {}; $RoleDto = new class([]) extends AbstractDto {};
$userDto = get_class($UserDto); $roleDto = get_class($RoleDto); $userDto = get_class($UserDto); $roleDto = get_class($RoleDto);
// DAOs // DAOs (constructors accept only connection; runtime configuration via static props)
$RoleDao = new class($conn, $rolesT, $roleDto) extends AbstractDao { $RoleDao = new class($conn) extends AbstractDao {
private string $table; private string $dto; public static string $table; public static string $dto;
public function __construct($c, string $table, string $dto) { parent::__construct($c); $this->table = $table; $this->dto = $dto; } public function __construct($c) { parent::__construct($c); }
public function getTable(): string { return $this->table; } public function getTable(): string { return self::$table; }
protected function dtoClass(): string { return $this->dto; } protected function dtoClass(): string { return self::$dto; }
protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'name'=>['cast'=>'string']]]; } protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'name'=>['cast'=>'string']]]; }
}; };
$UserDao = new class($conn, $usersT, $userDto, get_class($RoleDao), $pivotT) extends AbstractDao { $UserDao = new class($conn) extends AbstractDao {
private string $table; private string $dto; private string $roleDaoClass; private string $pivot; public static string $table; public static string $dto; public static string $roleDaoClass; public static string $pivot;
public function __construct($c, string $table, string $dto, string $roleDaoClass, string $pivot) { parent::__construct($c); $this->table=$table; $this->dto=$dto; $this->roleDaoClass=$roleDaoClass; $this->pivot=$pivot; } public function __construct($c) { parent::__construct($c); }
public function getTable(): string { return $this->table; } public function getTable(): string { return self::$table; }
protected function dtoClass(): string { return $this->dto; } protected function dtoClass(): string { return self::$dto; }
protected function relations(): array { protected function relations(): array {
return [ return [
'roles' => [ 'roles' => [
'type' => 'belongsToMany', 'type' => 'belongsToMany',
'dao' => $this->roleDaoClass, 'dao' => self::$roleDaoClass,
'pivot' => $this->pivot, 'pivot' => self::$pivot,
'foreignPivotKey' => 'user_id', 'foreignPivotKey' => 'user_id',
'relatedPivotKey' => 'role_id', 'relatedPivotKey' => 'role_id',
'localKey' => 'id', 'localKey' => 'id',
@ -82,8 +82,19 @@ final class BelongsToManyMysqlTest extends TestCase
protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'email'=>['cast'=>'string']]]; } protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'email'=>['cast'=>'string']]]; }
}; };
$roleDao = new $RoleDao($conn, $rolesT, $roleDto); // Configure static props for DAOs
$userDao = new $UserDao($conn, $usersT, $userDto, get_class($roleDao), $pivotT); $roleDaoClass = get_class($RoleDao);
$roleDaoClass::$table = $rolesT;
$roleDaoClass::$dto = $roleDto;
$userDaoClass = get_class($UserDao);
$userDaoClass::$table = $usersT;
$userDaoClass::$dto = $userDto;
$userDaoClass::$roleDaoClass = $roleDaoClass;
$userDaoClass::$pivot = $pivotT;
$roleDao = new $roleDaoClass($conn);
$userDao = new $userDaoClass($conn);
// Seed // Seed
$u = $userDao->insert(['email' => 'b@example.com']); $u = $userDao->insert(['email' => 'b@example.com']);

76
tests/JoinEagerMysqlTest.php
View file

@ -50,12 +50,12 @@ final class JoinEagerMysqlTest extends TestCase
$PostDto = new class([]) extends AbstractDto {}; $PostDto = new class([]) extends AbstractDto {};
$uClass = get_class($UserDto); $pClass = get_class($PostDto); $uClass = get_class($UserDto); $pClass = get_class($PostDto);
// DAOs // DAOs (constructors accept only connection; configured via static props)
$PostDao = new class($conn, $postsT, $pClass) extends AbstractDao { $PostDao = new class($conn) extends AbstractDao {
private string $table; private string $dto; public static string $table; public static string $dto;
public function __construct($c, string $table, string $dto) { parent::__construct($c); $this->table=$table; $this->dto=$dto; } public function __construct($c) { parent::__construct($c); }
public function getTable(): string { return $this->table; } public function getTable(): string { return self::$table; }
protected function dtoClass(): string { return $this->dto; } protected function dtoClass(): string { return self::$dto; }
protected function schema(): array { return [ protected function schema(): array { return [
'primaryKey' => 'id', 'primaryKey' => 'id',
'columns' => [ 'id'=>['cast'=>'int'], 'user_id'=>['cast'=>'int'], 'title'=>['cast'=>'string'], 'deleted_at'=>['cast'=>'datetime'] ], 'columns' => [ 'id'=>['cast'=>'int'], 'user_id'=>['cast'=>'int'], 'title'=>['cast'=>'string'], 'deleted_at'=>['cast'=>'datetime'] ],
@ -63,17 +63,26 @@ final class JoinEagerMysqlTest extends TestCase
]; } ]; }
}; };
$UserDao = new class($conn, $usersT, $uClass, get_class($PostDao)) extends AbstractDao { $UserDao = new class($conn) extends AbstractDao {
private string $table; private string $dto; private string $postDaoClass; public static string $table; public static string $dto; public static string $postDaoClass;
public function __construct($c, string $table, string $dto, string $postDaoClass) { parent::__construct($c); $this->table=$table; $this->dto=$dto; $this->postDaoClass=$postDaoClass; } public function __construct($c) { parent::__construct($c); }
public function getTable(): string { return $this->table; } public function getTable(): string { return self::$table; }
protected function dtoClass(): string { return $this->dto; } protected function dtoClass(): string { return self::$dto; }
protected function relations(): array { return [ 'posts' => [ 'type'=>'hasMany', 'dao'=>$this->postDaoClass, 'foreignKey'=>'user_id', 'localKey'=>'id' ] ]; } protected function relations(): array { return [ 'posts' => [ 'type'=>'hasMany', 'dao'=>self::$postDaoClass, 'foreignKey'=>'user_id', 'localKey'=>'id' ] ]; }
protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'name'=>['cast'=>'string']]]; } protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'name'=>['cast'=>'string']]]; }
}; };
$postDao = new $PostDao($conn, $postsT, $pClass); // Configure static props
$userDao = new $UserDao($conn, $usersT, $uClass, get_class($postDao)); $postDaoClass = get_class($PostDao);
$postDaoClass::$table = $postsT;
$postDaoClass::$dto = $pClass;
$userDaoClass = get_class($UserDao);
$userDaoClass::$table = $usersT;
$userDaoClass::$dto = $uClass;
$userDaoClass::$postDaoClass = $postDaoClass;
$postDao = new $postDaoClass($conn);
$userDao = new $userDaoClass($conn);
// Seed // Seed
$u1 = $userDao->insert(['name' => 'Alice']); $u1 = $userDao->insert(['name' => 'Alice']);
@ -85,15 +94,15 @@ final class JoinEagerMysqlTest extends TestCase
// soft-deleted child for Bob // soft-deleted child for Bob
$postDao->insert(['user_id' => $uid2, 'title' => 'Hidden', 'deleted_at' => gmdate('Y-m-d H:i:s')]); $postDao->insert(['user_id' => $uid2, 'title' => 'Hidden', 'deleted_at' => gmdate('Y-m-d H:i:s')]);
// Baseline batched eager // Baseline batched eager (include posts.user_id for grouping)
$baseline = $userDao->fields('id','name','posts.title')->with(['posts'])->findAllBy([]); $baseline = $userDao->fields('id','name','posts.user_id','posts.title')->with(['posts'])->findAllBy([]);
$this->assertCount(2, $baseline); $this->assertCount(2, $baseline);
$postsAlice = $baseline[0]->toArray(false)['posts'] ?? []; $postsAlice = $baseline[0]->toArray(false)['posts'] ?? [];
$this->assertIsArray($postsAlice); $this->assertIsArray($postsAlice);
$this->assertCount(2, $postsAlice); $this->assertCount(2, $postsAlice);
// Join-based eager (global) // Join-based eager (global)
$joined = $userDao->fields('id','name','posts.title')->useJoinEager()->with(['posts'])->findAllBy([]); $joined = $userDao->fields('id','name','posts.user_id','posts.title')->useJoinEager()->with(['posts'])->findAllBy([]);
$this->assertCount(2, $joined); $this->assertCount(2, $joined);
foreach ($joined as $u) { foreach ($joined as $u) {
$posts = $u->toArray(false)['posts'] ?? []; $posts = $u->toArray(false)['posts'] ?? [];
@ -102,17 +111,32 @@ final class JoinEagerMysqlTest extends TestCase
} }
} }
// belongsTo join: Posts -> User // belongsTo join: Posts -> User (use static-prop pattern for both sides)
$UserDao2 = get_class($userDao); $UserDao2 = new class($conn) extends AbstractDao {
$PostDao2 = new class($conn, $postsT, $pClass, $UserDao2, $usersT, $uClass) extends AbstractDao { public static string $table; public static string $dto;
private string $pTable; private string $dto; private string $userDaoClass; private string $uTable; private string $uDto; public function __construct($c){ parent::__construct($c); }
public function __construct($c,string $pTable,string $dto,string $userDaoClass,string $uTable,string $uDto){ parent::__construct($c); $this->pTable=$pTable; $this->dto=$dto; $this->userDaoClass=$userDaoClass; $this->uTable=$uTable; $this->uDto=$uDto; } public function getTable(): string { return self::$table; }
public function getTable(): string { return $this->pTable; } protected function dtoClass(): string { return self::$dto; }
protected function dtoClass(): string { return $this->dto; } protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'name'=>['cast'=>'string']]]; }
protected function relations(): array { return [ 'user' => [ 'type'=>'belongsTo', 'dao'=>get_class(new class($this->getConnection(), $this->uTable, $this->uDto) extends AbstractDao { private string $t; private string $d; public function __construct($c,string $t,string $d){ parent::__construct($c); $this->t=$t; $this->d=$d; } public function getTable(): string { return $this->t; } protected function dtoClass(): string { return $this->d; } protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'name'=>['cast'=>'string']]]; } }), 'foreignKey'=>'user_id', 'otherKey'=>'id' ] ]; } };
$userDao2Class = get_class($UserDao2);
$userDao2Class::$table = $usersT;
$userDao2Class::$dto = $uClass;
$PostDao2 = new class($conn) extends AbstractDao {
public static string $table; public static string $dto; public static string $userDaoClass;
public function __construct($c){ parent::__construct($c); }
public function getTable(): string { return self::$table; }
protected function dtoClass(): string { return self::$dto; }
protected function relations(): array { return [ 'user' => [ 'type'=>'belongsTo', 'dao'=>self::$userDaoClass, 'foreignKey'=>'user_id', 'otherKey'=>'id' ] ]; }
protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'user_id'=>['cast'=>'int'],'title'=>['cast'=>'string']]]; } protected function schema(): array { return ['primaryKey'=>'id','columns'=>['id'=>['cast'=>'int'],'user_id'=>['cast'=>'int'],'title'=>['cast'=>'string']]]; }
}; };
$postDaoJ = new $PostDao2($conn, $postsT, $pClass, $UserDao2, $usersT, $uClass); $postDao2Class = get_class($PostDao2);
$postDao2Class::$table = $postsT;
$postDao2Class::$dto = $pClass;
$postDao2Class::$userDaoClass = $userDao2Class;
$postDaoJ = new $postDao2Class($conn);
$rows = $postDaoJ->fields('id','title','user.name')->useJoinEager()->with(['user'])->findAllBy([]); $rows = $postDaoJ->fields('id','title','user.name')->useJoinEager()->with(['user'])->findAllBy([]);
$this->assertNotEmpty($rows); $this->assertNotEmpty($rows);
$arr = $rows[0]->toArray(false); $arr = $rows[0]->toArray(false);