Bugfix: persistent overrides options (#1555)

Fix that persistent would override other database options.

Closes: #1546
(cherry picked from commit 36db7a60)

lib/SimpleSAML/Database.php

@@ -84,7 +84,7 @@ class Database
     {
         $driverOptions = $config->getArray('database.driver_options', []);
         if ($config->getBoolean('database.persistent', true)) {
-            $driverOptions = [PDO::ATTR_PERSISTENT => true];
+            $driverOptions[PDO::ATTR_PERSISTENT] = true;
         }
 
         // connect to the master
@@ -128,7 +128,7 @@ class Database
                 'database.username'   => $config->getString('database.username', null),
                 'database.password'   => $config->getString('database.password', null),
                 'database.prefix'     => $config->getString('database.prefix', ''),
-                'database.persistent' => $config->getBoolean('database.persistent', false),
+                'database.persistent' => $config->getBoolean('database.persistent', true),
             ],
             'slaves' => $config->getArray('database.slaves', []),
         ];