Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 18 additions & 22 deletions tests/e2e/Adapter/MirrorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,34 +71,30 @@ protected static function getDatabase(bool $fresh = false): Mirror

$database = new Mirror(self::$source, self::$destination);

// Handle cases where the source and destination databases are not in sync because of previous tests
if ($database->getSource()->exists('schema1')) {
$database->getSource()->setDatabase('schema1')->delete();
}
if ($database->getDestination()->exists('schema1')) {
$database->getDestination()->setDatabase('schema1')->delete();
}
if ($database->getSource()->exists('schema2')) {
$database->getSource()->setDatabase('schema2')->delete();
}
if ($database->getDestination()->exists('schema2')) {
$database->getDestination()->setDatabase('schema2')->delete();
}
if ($database->getSource()->exists('sharedTables')) {
$database->getSource()->setDatabase('sharedTables')->delete();
}
if ($database->getDestination()->exists('sharedTables')) {
$database->getDestination()->setDatabase('sharedTables')->delete();
$schemas = [
'utopiaTests',
'schema1',
'schema2',
'sharedTables',
'sharedTablesTenantPerDocument'
];

/**
* Handle cases where the source and destination databases are not in sync because of previous tests
*/
foreach ($schemas as $schema) {
if ($database->getSource()->exists($schema)) {
$database->getSource()->setDatabase($schema)->delete();
}
if ($database->getDestination()->exists($schema)) {
$database->getDestination()->setDatabase($schema)->delete();
}
}

$database
->setDatabase('utopiaTests')
->setNamespace(static::$namespace = 'myapp_' . uniqid());

if ($database->exists()) {
$database->delete();
}

$database->create();

return self::$database = $database;
Expand Down
8 changes: 5 additions & 3 deletions tests/e2e/Adapter/Scopes/GeneralTests.php
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,9 @@ public function testNestedQueryValidation(): void

public function testSharedTablesTenantPerDocument(): void
{
/** @var Database $database */
$database = static::getDatabase();

$sharedTables = $database->getSharedTables();
$tenantPerDocument = $database->getTenantPerDocument();
$namespace = $database->getNamespace();
Expand All @@ -435,12 +437,12 @@ public function testSharedTablesTenantPerDocument(): void
return;
}

if ($database->exists(__FUNCTION__)) {
$database->delete(__FUNCTION__);
if ($database->exists('sharedTablesTenantPerDocument')) {
$database->delete('sharedTablesTenantPerDocument');
}

$database
->setDatabase(__FUNCTION__)
->setDatabase('sharedTablesTenantPerDocument')
->setNamespace('')
->setSharedTables(true)
->setTenant(null)
Expand Down