archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 21:54:03 +00:00
Code Activity

Bootstrapper tests

Browse source
This commit is contained in:
Samuel Štancl 2020-05-11 03:37:47 +02:00
parent 73fc525126
commit 6f4b9f486c
20 changed files with 266 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Database/Models/Tenant.php
View file

@ -8,7 +8,7 @@ use Stancl\Tenancy\Events;
use Stancl\Tenancy\Contracts;
// todo @property
class Tenant extends Model implements Contracts\Tenant
class Tenant extends Model implements Contracts\TenantWithDatabase
{
use Concerns\CentralConnection, Concerns\HasADataColumn, Concerns\GeneratesIds, Concerns\HasADataColumn {
Concerns\HasADataColumn::getCasts as dataColumnCasts;
@ -41,7 +41,7 @@ class Tenant extends Model implements Contracts\Tenant
public static function internalPrefix(): string
{
return config('tenancy.database_prefix');
return config('tenancy.internal_column_prefix');
}
/**
@ -76,15 +76,15 @@ class Tenant extends Model implements Contracts\Tenant
public function run(callable $callback)
{
// todo new logic with the manager
$originalTenant = $this->manager->getTenant();
$originalTenant = tenant();
$this->manager->initializeTenancy($this);
tenancy()->initialize($this);
$result = $callback($this);
$this->manager->endTenancy($this);
if ($originalTenant) {
$this->manager->initializeTenancy($originalTenant);
tenancy()->initialize($originalTenant);
} else {
tenancy()->end();
}
return $result;