Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for multidb tear down

This commit is contained in:
David Bomba 2025-08-12 19:28:41 +10:00
parent d7936081ea
commit b234013079
1 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tests/Integration/MultiDBUserTest.php
View File

@ -35,8 +35,6 @@ class MultiDBUserTest extends TestCase
{ {
parent::setUp(); parent::setUp();
// $this->withoutExceptionHandling();
if (! config('ninja.db.multi_db_enabled')) { if (! config('ninja.db.multi_db_enabled')) {
$this->markTestSkipped('Multi DB not enabled - skipping'); $this->markTestSkipped('Multi DB not enabled - skipping');
} }
@ -221,32 +219,53 @@ class MultiDBUserTest extends TestCase
protected function tearDown(): void protected function tearDown(): void
{ {
try {
// Clean up database records before calling parent::tearDown()
$this->cleanupTestData();
} catch (\Exception $e) {
// Log error but don't fail teardown
error_log("Error during test cleanup: " . $e->getMessage());
}
parent::tearDown(); parent::tearDown();
}
private function cleanupTestData(): void
$u = User::on('db-ninja-01')->where('email', 'db1@example.com')->first(); {
if ($u) { // Only proceed if we have database connections available
$u->account->delete(); if (!app()->bound('db') || !config('database.connections.db-ninja-01')) {
return;
}
try {
// Clean up db-ninja-01
if (DB::connection('db-ninja-01')->getPdo()) {
$u = User::on('db-ninja-01')->where('email', 'db1@example.com')->first();
if ($u && $u->account) {
$u->account->delete();
}
$u = User::on('db-ninja-01')->where('email', 'db2@example.com')->first();
if ($u && $u->account) {
$u->account->delete();
}
} }
// Clean up db-ninja-02
if (DB::connection('db-ninja-02')->getPdo()) {
$u = User::on('db-ninja-02')->where('email', 'db1@example.com')->first();
if ($u && $u->account) {
$u->account->delete();
}
$u = User::on('db-ninja-01')->where('email', 'db2@example.com')->first(); $u = User::on('db-ninja-02')->where('email', 'db2@example.com')->first();
if ($u) { if ($u && $u->account) {
$u->account->delete(); $u->account->delete();
}
} }
} catch (\Exception $e) {
// Log error but don't fail cleanup
$u = User::on('db-ninja-02')->where('email', 'db1@example.com')->first(); error_log("Error during database cleanup: " . $e->getMessage());
if ($u) { }
$u->account->delete();
}
$u = User::on('db-ninja-02')->where('email', 'db2@example.com')->first();
if ($u) {
$u->account->delete();
}
} }
} }