mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-18 03:35:17 +00:00
Code Issues Projects Releases Wiki Activity

Get database name from the connection

Browse source
This commit is contained in:
Yassine Guedidi 2024-01-21 02:44:37 +01:00
parent f161c4b437
commit 221ddc8ba0
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/config/services.yml
View file

@ -260,7 +260,6 @@ services:
Wallabag\Command\InstallCommand: Wallabag\Command\InstallCommand:
arguments: arguments:
$databaseDriver: '%database_driver%' $databaseDriver: '%database_driver%'
$databaseName: '%database_name%'
$defaultSettings: '%wallabag.default_internal_settings%' $defaultSettings: '%wallabag.default_internal_settings%'
$defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%' $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'

8
src/Command/InstallCommand.php
View file

@ -41,17 +41,15 @@ class InstallCommand extends Command
private EventDispatcherInterface $dispatcher; private EventDispatcherInterface $dispatcher;
private UserManagerInterface $userManager; private UserManagerInterface $userManager;
private string $databaseDriver; private string $databaseDriver;
private string $databaseName;
private array $defaultSettings; private array $defaultSettings;
private array $defaultIgnoreOriginInstanceRules; private array $defaultIgnoreOriginInstanceRules;
public function __construct(EntityManagerInterface $entityManager, EventDispatcherInterface $dispatcher, UserManagerInterface $userManager, string $databaseDriver, string $databaseName, array $defaultSettings, array $defaultIgnoreOriginInstanceRules) public function __construct(EntityManagerInterface $entityManager, EventDispatcherInterface $dispatcher, UserManagerInterface $userManager, string $databaseDriver, array $defaultSettings, array $defaultIgnoreOriginInstanceRules)
{ {
$this->entityManager = $entityManager; $this->entityManager = $entityManager;
$this->dispatcher = $dispatcher; $this->dispatcher = $dispatcher;
$this->userManager = $userManager; $this->userManager = $userManager;
$this->databaseDriver = $databaseDriver; $this->databaseDriver = $databaseDriver;
$this->databaseName = $databaseName;
$this->defaultSettings = $defaultSettings; $this->defaultSettings = $defaultSettings;
$this->defaultIgnoreOriginInstanceRules = $defaultIgnoreOriginInstanceRules; $this->defaultIgnoreOriginInstanceRules = $defaultIgnoreOriginInstanceRules;
@ -127,7 +125,7 @@ class InstallCommand extends Command
$conn->connect(); $conn->connect();
} catch (\Exception $e) { } catch (\Exception $e) {
if (!str_contains($e->getMessage(), 'Unknown database') if (!str_contains($e->getMessage(), 'Unknown database')
&& !str_contains($e->getMessage(), 'database "' . $this->databaseName . '" does not exist')) { && !str_contains($e->getMessage(), 'database "' . $conn->getDatabase() . '" does not exist')) {
$fulfilled = false; $fulfilled = false;
$status = '<error>ERROR!</error>'; $status = '<error>ERROR!</error>';
$help = 'Can\'t connect to the database: ' . $e->getMessage(); $help = 'Can\'t connect to the database: ' . $e->getMessage();
@ -387,7 +385,7 @@ class InstallCommand extends Command
private function isDatabasePresent() private function isDatabasePresent()
{ {
$connection = $this->entityManager->getConnection(); $connection = $this->entityManager->getConnection();
$databaseName = $connection->getDatabase(); $databaseName = $connection->getParams()['dbname'];
try { try {
$schemaManager = $connection->createSchemaManager(); $schemaManager = $connection->createSchemaManager();