Skip to content
Snippets Groups Projects
Commit 5d764a34 authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Fix build: given that username and password are optional for some PDO drivers,...

Fix build: given that username and password are optional for some PDO drivers, do not enforce them to be set in the configuration. Use null as a default value for them.
parent e2f0f2b9
No related branches found
No related tags found
No related merge requests found
...@@ -81,8 +81,8 @@ class Database ...@@ -81,8 +81,8 @@ class Database
// Connect to the master // Connect to the master
$this->dbMaster = $this->connect( $this->dbMaster = $this->connect(
$config->getString('database.dsn'), $config->getString('database.dsn'),
$config->getString('database.username'), $config->getString('database.username', null),
$config->getString('database.password'), $config->getString('database.password', null),
$driverOptions $driverOptions
); );
...@@ -119,8 +119,8 @@ class Database ...@@ -119,8 +119,8 @@ class Database
$assembledConfig = array( $assembledConfig = array(
'master' => array( 'master' => array(
'database.dsn' => $config->getString('database.dsn'), 'database.dsn' => $config->getString('database.dsn'),
'database.username' => $config->getString('database.username'), 'database.username' => $config->getString('database.username', null),
'database.password' => $config->getString('database.password'), 'database.password' => $config->getString('database.password', null),
'database.prefix' => $config->getString('database.prefix', ''), 'database.prefix' => $config->getString('database.prefix', ''),
'database.persistent' => $config->getBoolean('database.persistent', false), 'database.persistent' => $config->getBoolean('database.persistent', false),
), ),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment