Merge pull request #3480 from Icinga/fix/revert-persistent-db-connections
No longer support persistent database connections
This commit is contained in:
commit
c633c86db7
|
@ -146,17 +146,6 @@ class DbResourceForm extends Form
|
|||
'label' => $this->translate('Character Set')
|
||||
)
|
||||
);
|
||||
$this->addElement(
|
||||
'checkbox',
|
||||
'persistent',
|
||||
array(
|
||||
'description' => $this->translate(
|
||||
'Check this box for persistent database connections. Persistent connections are not closed at the'
|
||||
. ' end of a request, but are cached and re-used. This is experimental'
|
||||
),
|
||||
'label' => $this->translate('Persistent')
|
||||
)
|
||||
);
|
||||
$this->addElement(
|
||||
'checkbox',
|
||||
'use_ssl',
|
||||
|
|
|
@ -141,7 +141,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
|
|||
'password' => $this->config->password,
|
||||
'dbname' => $this->config->dbname,
|
||||
'charset' => $this->config->charset ?: null,
|
||||
'persistent' => (bool) $this->config->get('persistent', false),
|
||||
'options' => & $genericAdapterOptions,
|
||||
'driver_options' => & $driverOptions
|
||||
);
|
||||
|
@ -159,7 +158,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
|
|||
}
|
||||
if ($pdoType === 'dblib') {
|
||||
// Driver does not support setting attributes
|
||||
unset($adapterParamaters['persistent']);
|
||||
unset($adapterParamaters['options']);
|
||||
unset($adapterParamaters['driver_options']);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue