1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 14:14:04 +00:00

Use seeder params in tenants:seed instead of just the automatic seeder (#317)

* Use seeder params in tenants:seed instead of just the automatic seeder

* Left trim - from option names

* Use no seeder params for tests
This commit is contained in:
Samuel Štancl 2020-03-17 15:59:45 +01:00 committed by GitHub
parent 776af4643c
commit 526f0826a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions

View file

@ -104,7 +104,7 @@ return [
], ],
'seed_after_migration' => false, // should the seeder run after automatic migration 'seed_after_migration' => false, // should the seeder run after automatic migration
'seeder_parameters' => [ 'seeder_parameters' => [
'--class' => 'DatabaseSeeder', // root seeder class to run after automatic migrations, e.g.: 'DatabaseSeeder' '--class' => 'DatabaseSeeder', // root seeder class, e.g.: 'DatabaseSeeder'
// '--force' => true, // force database seeder // '--force' => true, // force database seeder
], ],
'queue_database_deletion' => false, 'queue_database_deletion' => false,

View file

@ -52,6 +52,10 @@ class Seed extends SeedCommand
$this->input->setOption('database', $tenant->getConnectionName()); $this->input->setOption('database', $tenant->getConnectionName());
foreach (config('tenancy.seeder_parameters') as $parameter => $value) {
$this->input->setOption(ltrim($parameter, '-'), $value);
}
$tenant->run(function () { $tenant->run(function () {
// Seed // Seed
parent::handle(); parent::handle();

View file

@ -19,13 +19,9 @@ class QueuedTenantDatabaseSeeder implements ShouldQueue
/** @var string */ /** @var string */
protected $tenantId; protected $tenantId;
/** @var array */ public function __construct(Tenant $tenant)
protected $seederParameters = [];
public function __construct(Tenant $tenant, $seederParameters = [])
{ {
$this->tenantId = $tenant->id; $this->tenantId = $tenant->id;
$this->seederParameters = $seederParameters;
} }
/** /**
@ -37,6 +33,6 @@ class QueuedTenantDatabaseSeeder implements ShouldQueue
{ {
Artisan::call('tenants:seed', [ Artisan::call('tenants:seed', [
'--tenants' => [$this->tenantId], '--tenants' => [$this->tenantId],
] + $this->seederParameters); ]);
} }
} }

View file

@ -86,11 +86,11 @@ class TenantManager
if ($this->shouldSeedAfterMigration()) { if ($this->shouldSeedAfterMigration()) {
$afterCreating[] = $this->databaseCreationQueued() $afterCreating[] = $this->databaseCreationQueued()
? new QueuedTenantDatabaseSeeder($tenant, $this->getSeederParameters()) ? new QueuedTenantDatabaseSeeder($tenant)
: function () use ($tenant) { : function () use ($tenant) {
$this->artisan->call('tenants:seed', [ $this->artisan->call('tenants:seed', [
'--tenants' => [$tenant['id']], '--tenants' => [$tenant['id']],
] + $this->getSeederParameters()); ]);
}; };
} }

View file

@ -104,6 +104,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
'driver' => 'sync', 'driver' => 'sync',
'central' => true, 'central' => true,
], ],
'tenancy.seeder_parameters' => [],
]); ]);
$app->singleton(\Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class); $app->singleton(\Stancl\Tenancy\TenancyBootstrappers\RedisTenancyBootstrapper::class);