[3.x] DB users (#382)

* Initial draft

* Apply fixes from StyleCI

* Use CI on master branch too

* Pass correct argument to queued DB creators/deleters

* Apply fixes from StyleCI

* Remove new interface from MySQLDBManager

* Make phpunit run

* Apply fixes from StyleCI

* Fix static property

* Default databaseName

* Use database transactions for creating users & granting permissions

* Apply fixes from StyleCI

* Get old tests to pass

* Apply fixes from StyleCI

* Add tests for PermissionControlledMySQLDatabaseManager

* Apply fixes from StyleCI

* Write test for extra config, fix bug with extra config

* Apply fixes from StyleCI

src/Commands/Migrate.php

@@ -45,6 +45,12 @@ class Migrate extends MigrateCommand
      */
     public function handle()
     {
+        foreach (config('tenancy.migration_parameters') as $parameter => $value) {
+            if (! $this->input->hasParameterOption($parameter)) {
+                $this->input->setOption(ltrim($parameter, '-'), $value);
+            }
+        }
+
         if (! $this->confirmToProceed()) {
             return;
         }
@@ -52,8 +58,6 @@ class Migrate extends MigrateCommand
         tenancy()->all($this->option('tenants'))->each(function ($tenant) {
             $this->line("Tenant: {$tenant['id']}");
 
-            $this->input->setOption('database', $tenant->getConnectionName());
-
             $tenant->run(function () {
                 // Migrate
                 parent::handle();

src/Commands/MigrateFresh.php

@@ -39,7 +39,7 @@ final class MigrateFresh extends Command
             $tenant->run(function ($tenant) {
                 $this->info('Dropping tables.');
                 $this->call('db:wipe', array_filter([
-                    '--database' => $tenant->getConnectionName(),
+                    '--database' => 'tenant',
                     '--force' => true,
                 ]));
 

src/Commands/Rollback.php

@@ -45,6 +45,12 @@ class Rollback extends RollbackCommand
      */
     public function handle()
     {
+        foreach (config('tenancy.migration_parameters') as $parameter => $value) {
+            if (! $this->input->hasParameterOption($parameter)) {
+                $this->input->setOption(ltrim($parameter, '-'), $value);
+            }
+        }
+
         if (! $this->confirmToProceed()) {
             return;
         }
@@ -52,8 +58,6 @@ class Rollback extends RollbackCommand
         tenancy()->all($this->option('tenants'))->each(function ($tenant) {
             $this->line("Tenant: {$tenant['id']}");
 
-            $this->input->setOption('database', $tenant->getConnectionName());
-
             $tenant->run(function () {
                 // Rollback
                 parent::handle();

src/Commands/Seed.php

@@ -56,8 +56,6 @@ class Seed extends SeedCommand
         tenancy()->all($this->option('tenants'))->each(function ($tenant) {
             $this->line("Tenant: {$tenant['id']}");
 
-            $this->input->setOption('database', $tenant->getConnectionName());
-
             $tenant->run(function () {
                 // Seed
                 parent::handle();

src/Contracts/ManagesDatabaseUsers.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Contracts;
+
+use Stancl\Tenancy\DatabaseConfig;
+
+interface ManagesDatabaseUsers extends TenantDatabaseManager
+{
+    public function createUser(DatabaseConfig $databaseConfig): bool;
+
+    public function deleteUser(DatabaseConfig $databaseConfig): bool;
+
+    public function userExists(string $username): bool;
+}

src/Contracts/ModifiesDatabaseNameForConnection.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Contracts;
+
+/**
+ * Used by sqlite to wrap database name in database_path().
+ */
+interface ModifiesDatabaseNameForConnection
+{
+    public function getDatabaseNameForConnection(string $original): string;
+}

src/Contracts/TenantDatabaseManager.php

@@ -4,23 +4,26 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\Contracts;
 
+use Stancl\Tenancy\Tenant;
+
 interface TenantDatabaseManager
 {
     /**
-     * Create a database.
+     * Return the config key that separates databases (e.g. 'database' or 'schema').
      *
-     * @param  string $name Name of the database.
-     * @return bool
+     * @return string
      */
-    public function createDatabase(string $name): bool;
+    public function getSeparator(): string;
+
+    /**
+     * Create a database.
+     */
+    public function createDatabase(Tenant $tenant): bool;
 
     /**
      * Delete a database.
-     *
-     * @param  string $name Name of the database.
-     * @return bool
      */
-    public function deleteDatabase(string $name): bool;
+    public function deleteDatabase(Tenant $tenant): bool;
 
     /**
      * Does a database exist.

src/DatabaseConfig.php

@@ -0,0 +1,166 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy;
+
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+use Stancl\Tenancy\Contracts\Future\CanSetConnection;
+use Stancl\Tenancy\Contracts\ManagesDatabaseUsers;
+use Stancl\Tenancy\Contracts\ModifiesDatabaseNameForConnection;
+use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException;
+
+class DatabaseConfig
+{
+    /** @var Tenant */
+    public $tenant;
+
+    /** @var callable */
+    public static $usernameGenerator;
+
+    /** @var callable */
+    public static $passwordGenerator;
+
+    /** @var callable */
+    public static $databaseNameGenerator;
+
+    public static function __constructStatic(): void
+    {
+        static::$usernameGenerator = static::$usernameGenerator ?? function (Tenant $tenant) {
+            return Str::random(16);
+        };
+
+        static::$passwordGenerator = static::$usernameGenerator ?? function (Tenant $tenant) {
+            return Hash::make(Str::random(32));
+        };
+
+        static::$databaseNameGenerator = static::$databaseNameGenerator ?? function (Tenant $tenant) {
+            return config('tenancy.database.prefix') . $tenant->id . config('tenancy.database.suffix');
+        };
+    }
+
+    public function __construct(Tenant $tenant)
+    {
+        static::__constructStatic();
+
+        $this->tenant = $tenant;
+    }
+
+    public static function generateDatabaseNamesUsing(callable $databaseNameGenerator): void
+    {
+        static::$databaseNameGenerator = $databaseNameGenerator;
+    }
+
+    public static function generateUsernamesUsing(callable $usernameGenerator): void
+    {
+        static::$usernameGenerator = $usernameGenerator;
+    }
+
+    public static function generatePasswordsUsing(callable $passwordGenerator): void
+    {
+        static::$passwordGenerator = $passwordGenerator;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->tenant->data['_tenancy_db_name'] ?? (static::$databaseNameGenerator)($this->tenant);
+    }
+
+    public function getUsername(): ?string
+    {
+        return $this->tenant->data['_tenancy_db_username'] ?? null;
+    }
+
+    public function getPassword(): ?string
+    {
+        return $this->tenant->data['_tenancy_db_password'] ?? null;
+    }
+
+    public function makeCredentials(): void
+    {
+        $this->tenant->data['_tenancy_db_name'] = $this->getName() ?? (static::$databaseNameGenerator)($this->tenant);
+
+        if ($this->manager() instanceof ManagesDatabaseUsers) {
+            $this->tenant->data['_tenancy_db_username'] = $this->getUsername() ?? (static::$usernameGenerator)($this->tenant);
+            $this->tenant->data['_tenancy_db_password'] = $this->getPassword() ?? (static::$passwordGenerator)($this->tenant);
+        }
+    }
+
+    public function getTemplateConnectionName(): string
+    {
+        return $this->tenant->data['_tenancy_db_connection']
+            ?? config('tenancy.database.template_connection')
+            ?? DatabaseManager::$originalDefaultConnectionName;
+    }
+
+    /**
+     * Tenant's own database connection config.
+     */
+    public function connection(): array
+    {
+        $template = $this->getTemplateConnectionName();
+
+        $templateConnection = config("database.connections.{$template}");
+
+        $databaseName = $this->getName();
+        if (($manager = $this->manager()) instanceof ModifiesDatabaseNameForConnection) {
+            /** @var ModifiesDatabaseNameForConnection $manager */
+            $databaseName = $manager->getDatabaseNameForConnection($databaseName);
+        }
+
+        return array_merge($templateConnection, $this->tenantConfig(), [
+            $this->manager()->getSeparator() => $databaseName,
+        ]);
+    }
+
+    /**
+     * Additional config for the database connection, specific to this tenant.
+     */
+    public function tenantConfig(): array
+    {
+        $dbConfig = array_filter(array_keys($this->tenant->data), function ($key) {
+            return Str::startsWith($key, '_tenancy_db_');
+        });
+
+        // Remove DB name because we set that separately
+        if (($pos = array_search('_tenancy_db_name', $dbConfig)) !== false) {
+            unset($dbConfig[$pos]);
+        }
+
+        // Remove DB connection because that's not used inside the array
+        if (($pos = array_search('_tenancy_db_connection', $dbConfig)) !== false) {
+            unset($dbConfig[$pos]);
+        }
+
+        return array_reduce($dbConfig, function ($config, $key) {
+            return array_merge($config, [
+                Str::substr($key, strlen('_tenancy_db_')) => $this->tenant[$key],
+            ]);
+        }, []);
+    }
+
+    /**
+     * Get the TenantDatabaseManager for this tenant's connection.
+     */
+    public function manager(): TenantDatabaseManager
+    {
+        $driver = config("database.connections.{$this->getTemplateConnectionName()}.driver");
+
+        $databaseManagers = config('tenancy.database_managers');
+
+        if (! array_key_exists($driver, $databaseManagers)) {
+            throw new DatabaseManagerNotRegisteredException($driver);
+        }
+
+        /** @var TenantDatabaseManager $databaseManager */
+        $databaseManager = app($databaseManagers[$driver]);
+
+        if ($databaseManager instanceof CanSetConnection) {
+            $databaseManager->setConnection($this->getTemplateConnectionName());
+        }
+
+        return $databaseManager;
+    }
+}

src/DatabaseManager.php

@@ -8,18 +8,19 @@ use Closure;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\DatabaseManager as BaseDatabaseManager;
 use Illuminate\Foundation\Application;
-use Stancl\Tenancy\Contracts\Future\CanSetConnection;
 use Stancl\Tenancy\Contracts\TenantCannotBeCreatedException;
-use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException;
 use Stancl\Tenancy\Exceptions\TenantDatabaseAlreadyExistsException;
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseCreator;
 use Stancl\Tenancy\Jobs\QueuedTenantDatabaseDeleter;
 
+/**
+ * @internal Class is subject to breaking changes in minor and patch versions.
+ */
 class DatabaseManager
 {
     /** @var string */
-    public $originalDefaultConnectionName;
+    public static $originalDefaultConnectionName;
 
     /** @var Application */
     protected $app;
@@ -34,14 +35,11 @@ class DatabaseManager
     {
         $this->app = $app;
         $this->database = $database;
-        $this->originalDefaultConnectionName = $app['config']['database.default'];
+        static::$originalDefaultConnectionName = $app['config']['database.default'];
     }
 
     /**
      * Set the TenantManager instance, used to dispatch tenancy events.
-     *
-     * @param TenantManager $tenantManager
-     * @return self
      */
     public function withTenantManager(TenantManager $tenantManager): self
     {
@@ -52,35 +50,28 @@ class DatabaseManager
 
     /**
      * Connect to a tenant's database.
-     *
-     * @param Tenant $tenant
-     * @return void
      */
     public function connect(Tenant $tenant)
     {
-        $this->createTenantConnection($tenant->getDatabaseName(), $tenant->getConnectionName());
-        $this->setDefaultConnection($tenant->getConnectionName());
-        $this->switchConnection($tenant->getConnectionName());
+        $this->createTenantConnection($tenant);
+        $this->setDefaultConnection('tenant');
+        $this->switchConnection('tenant');
     }
 
     /**
      * Reconnect to the default non-tenant connection.
-     *
-     * @return void
      */
     public function reconnect()
     {
-        // Opposite order to connect() because we don't
-        // want to ever purge the central connection
-        $this->switchConnection($this->originalDefaultConnectionName);
-        $this->setDefaultConnection($this->originalDefaultConnectionName);
+        if ($this->tenancy->initialized) {
+            $this->database->purge('tenant');
+        }
+        $this->setDefaultConnection(static::$originalDefaultConnectionName);
+        $this->switchConnection(static::$originalDefaultConnectionName);
     }
 
     /**
      * Change the default database connection config.
-     *
-     * @param string $connection
-     * @return void
      */
     public function setDefaultConnection(string $connection)
     {
@@ -89,57 +80,17 @@ class DatabaseManager
 
     /**
      * Create the tenant database connection.
-     *
-     * @param string $databaseName
-     * @param string $connectionName
-     * @return void
      */
-    public function createTenantConnection($databaseName, $connectionName)
+    public function createTenantConnection(Tenant $tenant)
     {
-        // Create the database connection.
-        $based_on = $this->getBaseConnection($connectionName);
-        $this->app['config']["database.connections.$connectionName"] = $this->app['config']['database.connections.' . $based_on];
-
-        // Change database name.
-        $databaseName = $this->getDriver($connectionName) === 'sqlite' ? database_path($databaseName) : $databaseName;
-        $separateBy = $this->separateBy($connectionName);
-
-        $this->app['config']["database.connections.$connectionName.$separateBy"] = $databaseName;
-    }
-
-    /**
-     * Get the name of the connection that $connectionName should be based on.
-     *
-     * @param string $connectionName
-     * @return string
-     */
-    public function getBaseConnection(string $connectionName): string
-    {
-        return ($connectionName !== 'tenant' ? $connectionName : null) // 'tenant' is not a specific connection, it's the default
-            ?? $this->app['config']['tenancy.database.based_on']
-            ?? $this->originalDefaultConnectionName; // tenancy.database.based_on === null => use the default connection
-    }
-
-    /**
-     * Get the driver of a database connection.
-     *
-     * @param string $connectionName
-     * @return string|null
-     */
-    public function getDriver(string $connectionName): ?string
-    {
-        return $this->app['config']["database.connections.$connectionName.driver"];
+        $this->app['config']['database.connections.tenant'] = $tenant->database()->connection();
     }
 
     /**
      * Switch the application's connection.
-     *
-     * @param string $connection
-     * @return void
      */
     public function switchConnection(string $connection)
     {
-        $this->database->purge();
         $this->database->reconnect($connection);
         $this->database->setDefaultConnection($connection);
     }
@@ -147,15 +98,13 @@ class DatabaseManager
     /**
      * Check if a tenant can be created.
      *
-     * @param Tenant $tenant
-     * @return void
      * @throws TenantCannotBeCreatedException
      * @throws DatabaseManagerNotRegisteredException
      * @throws TenantDatabaseAlreadyExistsException
      */
     public function ensureTenantCanBeCreated(Tenant $tenant): void
     {
-        if ($this->getTenantDatabaseManager($tenant)->databaseExists($database = $tenant->getDatabaseName())) {
+        if ($tenant->database()->manager()->databaseExists($database = $tenant->database()->getName())) {
             throw new TenantDatabaseAlreadyExistsException($database);
         }
     }
@@ -170,101 +119,66 @@ class DatabaseManager
      */
     public function createDatabase(Tenant $tenant, array $afterCreating = [])
     {
-        $database = $tenant->getDatabaseName();
-        $manager = $this->getTenantDatabaseManager($tenant);
-
         $afterCreating = array_merge(
             $afterCreating,
-            $this->tenancy->event('database.creating', $database, $tenant)
+            $this->tenancy->event('database.creating', $tenant->database()->getName(), $tenant)
         );
 
         if ($this->app['config']['tenancy.queue_database_creation'] ?? false) {
-            $chain = [];
-            foreach ($afterCreating as $item) {
-                if (is_string($item) && class_exists($item)) {
-                    $chain[] = new $item($tenant); // Classes are instantiated and given $tenant
-                } elseif ($item instanceof ShouldQueue) {
-                    $chain[] = $item;
-                }
-            }
-
-            QueuedTenantDatabaseCreator::withChain($chain)->dispatch($manager, $database);
+            $this->createDatabaseAsynchronously($tenant, $afterCreating);
         } else {
-            $manager->createDatabase($database);
-            foreach ($afterCreating as $item) {
-                if (is_object($item) && ! $item instanceof Closure) {
-                    $item->handle($tenant);
-                } else {
-                    $item($tenant);
-                }
+            $this->createDatabaseSynchronously($tenant, $afterCreating);
+        }
+
+        $this->tenancy->event('database.created', $tenant->database()->getName(), $tenant);
+    }
+
+    protected function createDatabaseAsynchronously(Tenant $tenant, array $afterCreating)
+    {
+        $chain = [];
+        foreach ($afterCreating as $item) {
+            if (is_string($item) && class_exists($item)) {
+                $chain[] = new $item($tenant); // Classes are instantiated and given $tenant
+            } elseif ($item instanceof ShouldQueue) {
+                $chain[] = $item;
             }
         }
 
-        $this->tenancy->event('database.created', $database, $tenant);
+        QueuedTenantDatabaseCreator::withChain($chain)->dispatch($tenant->database()->manager(), $tenant);
+    }
+
+    protected function createDatabaseSynchronously(Tenant $tenant, array $afterCreating)
+    {
+        $manager = $tenant->database()->manager();
+        $manager->createDatabase($tenant);
+
+        foreach ($afterCreating as $item) {
+            if (is_object($item) && ! $item instanceof Closure) {
+                $item->handle($tenant);
+            } else {
+                $item($tenant);
+            }
+        }
     }
 
     /**
      * Delete a tenant's database.
      *
-     * @param Tenant $tenant
-     * @return void
      * @throws DatabaseManagerNotRegisteredException
      */
     public function deleteDatabase(Tenant $tenant)
     {
-        $database = $tenant->getDatabaseName();
-        $manager = $this->getTenantDatabaseManager($tenant);
+        $database = $tenant->database()->getName();
+        $manager = $tenant->database()->manager();
 
         $this->tenancy->event('database.deleting', $database, $tenant);
 
         if ($this->app['config']['tenancy.queue_database_deletion'] ?? false) {
-            QueuedTenantDatabaseDeleter::dispatch($manager, $database);
+            QueuedTenantDatabaseDeleter::dispatch($manager, $tenant);
         } else {
-            $manager->deleteDatabase($database);
+            $manager->deleteDatabase($tenant);
         }
 
         $this->tenancy->event('database.deleted', $database, $tenant);
     }
-
-    /**
-     * Get the TenantDatabaseManager for a tenant's database connection.
-     *
-     * @param Tenant $tenant
-     * @return TenantDatabaseManager
-     * @throws DatabaseManagerNotRegisteredException
-     */
-    public function getTenantDatabaseManager(Tenant $tenant): TenantDatabaseManager
-    {
-        $driver = $this->getDriver($this->getBaseConnection($connectionName = $tenant->getConnectionName()));
-
-        $databaseManagers = $this->app['config']['tenancy.database_managers'];
-
-        if (! array_key_exists($driver, $databaseManagers)) {
-            throw new DatabaseManagerNotRegisteredException($driver);
-        }
-
-        $databaseManager = $this->app[$databaseManagers[$driver]];
-
-        if ($connectionName !== 'tenant' && $databaseManager instanceof CanSetConnection) {
-            $databaseManager->setConnection($connectionName);
-        }
-
-        return $databaseManager;
-    }
-
-    /**
-     * What key on the connection config should be used to separate tenants.
-     *
-     * @param string $connectionName
-     * @return string
-     */
-    public function separateBy(string $connectionName): string
-    {
-        if ($this->getDriver($this->getBaseConnection($connectionName)) === 'pgsql'
-            && $this->app['config']['tenancy.database.separate_by'] === 'schema') {
-            return 'schema';
-        }
-
-        return 'database';
-    }
 }

src/Exceptions/TenantDatabaseUserAlreadyExistsException.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Exceptions;
+
+use Stancl\Tenancy\Contracts\TenantCannotBeCreatedException;
+
+class TenantDatabaseUserAlreadyExistsException extends TenantCannotBeCreatedException
+{
+    /** @var string */
+    protected $user;
+
+    public function reason(): string
+    {
+        return "Database user {$this->user} already exists.";
+    }
+
+    public function __construct(string $user)
+    {
+        parent::__construct();
+
+        $this->user = $user;
+    }
+}

src/Jobs/QueuedTenantDatabaseCreator.php

@@ -10,6 +10,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Tenant;
 
 class QueuedTenantDatabaseCreator implements ShouldQueue
 {
@@ -18,20 +19,13 @@ class QueuedTenantDatabaseCreator implements ShouldQueue
     /** @var TenantDatabaseManager */
     protected $databaseManager;
 
-    /** @var string */
-    protected $databaseName;
+    /** @var Tenant */
+    protected $tenant;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param TenantDatabaseManager $databaseManager
-     * @param string $databaseName
-     * @return void
-     */
-    public function __construct(TenantDatabaseManager $databaseManager, string $databaseName)
+    public function __construct(TenantDatabaseManager $databaseManager, Tenant $tenant)
     {
         $this->databaseManager = $databaseManager;
-        $this->databaseName = $databaseName;
+        $this->tenant = $tenant;
     }
 
     /**
@@ -41,6 +35,6 @@ class QueuedTenantDatabaseCreator implements ShouldQueue
      */
     public function handle()
     {
-        $this->databaseManager->createDatabase($this->databaseName);
+        $this->databaseManager->createDatabase($this->tenant);
     }
 }

src/Jobs/QueuedTenantDatabaseDeleter.php

@@ -10,6 +10,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Tenant;
 
 class QueuedTenantDatabaseDeleter implements ShouldQueue
 {
@@ -18,20 +19,13 @@ class QueuedTenantDatabaseDeleter implements ShouldQueue
     /** @var TenantDatabaseManager */
     protected $databaseManager;
 
-    /** @var string */
-    protected $databaseName;
+    /** @var Tenant */
+    protected $tenant;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param TenantDatabaseManager $databaseManager
-     * @param string $databaseName
-     * @return void
-     */
-    public function __construct(TenantDatabaseManager $databaseManager, string $databaseName)
+    public function __construct(TenantDatabaseManager $databaseManager, Tenant $tenant)
     {
         $this->databaseManager = $databaseManager;
-        $this->databaseName = $databaseName;
+        $this->tenant = $tenant;
     }
 
     /**
@@ -41,6 +35,6 @@ class QueuedTenantDatabaseDeleter implements ShouldQueue
      */
     public function handle()
     {
-        $this->databaseManager->deleteDatabase($this->databaseName);
+        $this->databaseManager->deleteDatabase($this->tenant);
     }
 }

src/StorageDrivers/Database/DatabaseStorageDriver.php

@@ -21,22 +21,22 @@ use Stancl\Tenancy\Tenant;
 class DatabaseStorageDriver implements StorageDriver, CanDeleteKeys, CanFindByAnyKey
 {
     /** @var Application */
-    protected $app;
+    public $app;
 
     /** @var Connection */
-    protected $centralDatabase;
+    public $centralDatabase;
 
     /** @var TenantRepository */
-    protected $tenants;
+    public $tenants;
 
     /** @var DomainRepository */
-    protected $domains;
+    public $domains;
 
     /** @var CachedTenantResolver */
-    protected $cache;
+    public $cache;
 
     /** @var Tenant The default tenant. */
-    protected $tenant;
+    public $tenant;
 
     public function __construct(Application $app, ConfigRepository $config, CachedTenantResolver $cache)
     {
@@ -59,7 +59,7 @@ class DatabaseStorageDriver implements StorageDriver, CanDeleteKeys, CanFindByAn
 
     public static function getCentralConnectionName(): string
     {
-        return config('tenancy.storage_drivers.db.connection') ?? app(DatabaseManager::class)->originalDefaultConnectionName;
+        return config('tenancy.storage_drivers.db.connection') ?? DatabaseManager::$originalDefaultConnectionName;
     }
 
     public function findByDomain(string $domain): Tenant

src/StorageDrivers/Database/DomainRepository.php

@@ -50,8 +50,6 @@ class DomainRepository extends Repository
 
     public function getTable(ConfigRepository $config)
     {
-        return $config->get('tenancy.storage_drivers.db.table_names.DomainModel') // legacy
-            ?? $config->get('tenancy.storage_drivers.db.table_names.domains')
-            ?? 'domains';
+        return $config->get('tenancy.storage_drivers.db.table_names.domains') ?? 'domains';
     }
 }

src/TenancyBootstrappers/DatabaseTenancyBootstrapper.php

@@ -21,8 +21,8 @@ class DatabaseTenancyBootstrapper implements TenancyBootstrapper
 
     public function start(Tenant $tenant)
     {
-        $database = $tenant->getDatabaseName();
-        if (! $this->database->getTenantDatabaseManager($tenant)->databaseExists($database)) {
+        $database = $tenant->database()->getName();
+        if (! $tenant->database()->manager()->databaseExists($database)) {
             throw new TenantDatabaseDoesNotExistException($database);
         }
 

src/Tenant.php

@@ -19,6 +19,7 @@ use Stancl\Tenancy\Exceptions\TenantStorageException;
 /**
  * @internal Class is subject to breaking changes in minor and patch versions.
  */
+// todo make this class serializable
 class Tenant implements ArrayAccess
 {
     use Traits\HasArrayAccess,
@@ -91,8 +92,7 @@ class Tenant implements ArrayAccess
     }
 
     /**
-     * DO NOT CALL THIS METHOD FROM USERLAND. Used by storage
-     * drivers to create persisted instances of Tenant.
+     * Used by storage drivers to create persisted instances of Tenant.
      *
      * @param array $data
      * @return self
@@ -230,6 +230,7 @@ class Tenant implements ArrayAccess
         if ($this->persisted) {
             $this->manager->updateTenant($this);
         } else {
+            $this->database()->makeCredentials();
             $this->manager->createTenant($this);
         }
 
@@ -272,23 +273,13 @@ class Tenant implements ArrayAccess
     }
 
     /**
-     * Get the tenant's database's name.
+     * Get database config.
      *
-     * @return string
+     * @return DatabaseConfig
      */
-    public function getDatabaseName(): string
+    public function database(): DatabaseConfig
     {
-        return $this->data['_tenancy_db_name'] ?? ($this->config->get('tenancy.database.prefix') . $this->id . $this->config->get('tenancy.database.suffix'));
-    }
-
-    /**
-     * Get the tenant's database connection's name.
-     *
-     * @return string
-     */
-    public function getConnectionName(): string
-    {
-        return $this->data['_tenancy_db_connection'] ?? 'tenant';
+        return new DatabaseConfig($this);
     }
 
     /**

src/TenantDatabaseManagers/MySQLDatabaseManager.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Connection;
 use Illuminate\Support\Facades\DB;
 use Stancl\Tenancy\Contracts\Future\CanSetConnection;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Tenant;
 
 class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
 {
@@ -20,6 +21,11 @@ class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
         $this->connection = $config->get('tenancy.database_manager_connections.mysql');
     }
 
+    public function getSeparator(): string
+    {
+        return 'database';
+    }
+
     protected function database(): Connection
     {
         return DB::connection($this->connection);
@@ -30,17 +36,18 @@ class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
         $this->connection = $connection;
     }
 
-    public function createDatabase(string $name): bool
+    public function createDatabase(Tenant $tenant): bool
     {
+        $database = $tenant->database()->getName();
         $charset = $this->database()->getConfig('charset');
         $collation = $this->database()->getConfig('collation');
 
-        return $this->database()->statement("CREATE DATABASE `$name` CHARACTER SET `$charset` COLLATE `$collation`");
+        return $this->database()->statement("CREATE DATABASE `{$database}` CHARACTER SET `$charset` COLLATE `$collation`");
     }
 
-    public function deleteDatabase(string $name): bool
+    public function deleteDatabase(Tenant $tenant): bool
     {
-        return $this->database()->statement("DROP DATABASE `$name`");
+        return $this->database()->statement("DROP DATABASE `{$tenant->database()->getName()}`");
     }
 
     public function databaseExists(string $name): bool

src/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\TenantDatabaseManagers;
+
+use Stancl\Tenancy\Contracts\ManagesDatabaseUsers;
+use Stancl\Tenancy\DatabaseConfig;
+use Stancl\Tenancy\Exceptions\TenantDatabaseUserAlreadyExistsException;
+use Stancl\Tenancy\Traits\CreatesDatabaseUsers;
+
+class PermissionControlledMySQLDatabaseManager extends MySQLDatabaseManager implements ManagesDatabaseUsers
+{
+    use CreatesDatabaseUsers;
+
+    public static $grants = [
+        'ALTER', 'ALTER ROUTINE', 'CREATE', 'CREATE ROUTINE', 'CREATE TEMPORARY TABLES', 'CREATE VIEW',
+        'DELETE', 'DROP', 'EVENT', 'EXECUTE', 'INDEX', 'INSERT', 'LOCK TABLES', 'REFERENCES', 'SELECT',
+        'SHOW VIEW', 'TRIGGER', 'UPDATE',
+    ];
+
+    public function createUser(DatabaseConfig $databaseConfig): bool
+    {
+        $database = $databaseConfig->getName();
+        $username = $databaseConfig->getUsername();
+        $hostname = $databaseConfig->connection()['host'];
+        $password = $databaseConfig->getPassword();
+
+        if ($this->userExists($username)) {
+            throw new TenantDatabaseUserAlreadyExistsException($username);
+        }
+
+        $this->database()->statement("CREATE USER `{$username}`@`{$hostname}` IDENTIFIED BY '{$password}'");
+
+        $grants = implode(', ', static::$grants);
+
+        if ($this->isVersion8()) { // MySQL 8+
+            $grantQuery = "GRANT $grants ON `$database`.* TO `$username`@`$hostname`";
+        } else { // MySQL 5.7
+            $grantQuery = "GRANT $grants ON `$database`.* TO `$username`@`$hostname` IDENTIFIED BY '$password'";
+        }
+
+        return $this->database()->statement($grantQuery);
+    }
+
+    protected function isVersion8(): bool
+    {
+        $version = $this->database()->select($this->database()->raw('select version()'))[0]->{'version()'};
+
+        return version_compare($version, '8.0.0') >= 0;
+    }
+
+    public function deleteUser(DatabaseConfig $databaseConfig): bool
+    {
+        return $this->database()->statement("DROP USER IF EXISTS '{$databaseConfig->getUsername()}'");
+    }
+
+    public function userExists(string $username): bool
+    {
+        return (bool) $this->database()->select("SELECT count(*) FROM mysql.user WHERE user = '$username'")[0]->{'count(*)'};
+    }
+}

src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Connection;
 use Illuminate\Support\Facades\DB;
 use Stancl\Tenancy\Contracts\Future\CanSetConnection;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Tenant;
 
 class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
 {
@@ -20,6 +21,11 @@ class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnecti
         $this->connection = $config->get('tenancy.database_manager_connections.pgsql');
     }
 
+    public function getSeparator(): string
+    {
+        return 'database';
+    }
+
     protected function database(): Connection
     {
         return DB::connection($this->connection);
@@ -30,14 +36,14 @@ class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnecti
         $this->connection = $connection;
     }
 
-    public function createDatabase(string $name): bool
+    public function createDatabase(Tenant $tenant): bool
     {
-        return $this->database()->statement("CREATE DATABASE \"$name\" WITH TEMPLATE=template0");
+        return $this->database()->statement("CREATE DATABASE \"{$tenant->database()->getName()}\" WITH TEMPLATE=template0");
     }
 
-    public function deleteDatabase(string $name): bool
+    public function deleteDatabase(Tenant $tenant): bool
     {
-        return $this->database()->statement("DROP DATABASE \"$name\"");
+        return $this->database()->statement("DROP DATABASE \"{$tenant->database()->getName()}\"");
     }
 
     public function databaseExists(string $name): bool

src/TenantDatabaseManagers/PostgreSQLSchemaManager.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Connection;
 use Illuminate\Support\Facades\DB;
 use Stancl\Tenancy\Contracts\Future\CanSetConnection;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Tenant;
 
 class PostgreSQLSchemaManager implements TenantDatabaseManager, CanSetConnection
 {
@@ -20,6 +21,11 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager, CanSetConnection
         $this->connection = $config->get('tenancy.database_manager_connections.pgsql');
     }
 
+    public function getSeparator(): string
+    {
+        return 'schema';
+    }
+
     protected function database(): Connection
     {
         return DB::connection($this->connection);
@@ -30,14 +36,14 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager, CanSetConnection
         $this->connection = $connection;
     }
 
-    public function createDatabase(string $name): bool
+    public function createDatabase(Tenant $tenant): bool
     {
-        return $this->database()->statement("CREATE SCHEMA \"$name\"");
+        return $this->database()->statement("CREATE SCHEMA \"{$tenant->database()->getName()}\"");
     }
 
-    public function deleteDatabase(string $name): bool
+    public function deleteDatabase(Tenant $tenant): bool
     {
-        return $this->database()->statement("DROP SCHEMA \"$name\"");
+        return $this->database()->statement("DROP SCHEMA \"{$tenant->database()->getName()}\"");
     }
 
     public function databaseExists(string $name): bool

src/TenantDatabaseManagers/SQLiteDatabaseManager.php

@@ -4,23 +4,30 @@ declare(strict_types=1);
 
 namespace Stancl\Tenancy\TenantDatabaseManagers;
 
+use Stancl\Tenancy\Contracts\ModifiesDatabaseNameForConnection;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
+use Stancl\Tenancy\Tenant;
 
-class SQLiteDatabaseManager implements TenantDatabaseManager
+class SQLiteDatabaseManager implements TenantDatabaseManager, ModifiesDatabaseNameForConnection
 {
-    public function createDatabase(string $name): bool
+    public function getSeparator(): string
+    {
+        return 'database';
+    }
+
+    public function createDatabase(Tenant $tenant): bool
     {
         try {
-            return fclose(fopen(database_path($name), 'w'));
+            return fclose(fopen(database_path($tenant->database()->getName()), 'w'));
         } catch (\Throwable $th) {
             return false;
         }
     }
 
-    public function deleteDatabase(string $name): bool
+    public function deleteDatabase(Tenant $tenant): bool
     {
         try {
-            return unlink(database_path($name));
+            return unlink(database_path($tenant->database()->getName()));
         } catch (\Throwable $th) {
             return false;
         }
@@ -30,4 +37,9 @@ class SQLiteDatabaseManager implements TenantDatabaseManager
     {
         return file_exists(database_path($name));
     }
+
+    public function getDatabaseNameForConnection(string $original): string
+    {
+        return database_path($original);
+    }
 }

src/Traits/CreatesDatabaseUsers.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Traits;
+
+use Stancl\Tenancy\Tenant;
+
+trait CreatesDatabaseUsers
+{
+    public function createDatabase(Tenant $tenant): bool
+    {
+        return $this->database()->transaction(function () use ($tenant) {
+            parent::createDatabase($tenant);
+
+            return $this->createUser($tenant->database());
+        });
+    }
+
+    public function deleteDatabase(Tenant $tenant): bool
+    {
+        return $this->database()->transaction(function () use ($tenant) {
+            parent::deleteDatabase($tenant);
+
+            return $this->deleteUser($tenant->database());
+        });
+    }
+}

src/Traits/DealsWithMigrations.php

@@ -12,6 +12,6 @@ trait DealsWithMigrations
             return parent::getMigrationPaths();
         }
 
-        return config('tenancy.migration_paths', [config('tenancy.migrations_directory') ?? database_path('migrations/tenant')]);
+        return database_path('migrations/tenant');
     }
 }