tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DbConnection: Respect port settings for all database types and provide defaults

This commit is contained in:
Eric Lippmann 2017-07-11 17:11:44 +02:00
parent b13c38b65b
commit f02d631aa1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Data/Db/DbConnection.php
View File

@ -140,6 +140,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
case 'mssql':
$adapter = 'Pdo_Mssql';
$adapterParamaters['pdoType'] = $this->config->get('pdoType', 'dblib');
$defaultPort = 1433;
break;
case 'mysql':
$adapter = 'Pdo_Mysql';
@ -176,8 +177,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
unset($adapterParamaters['charset']);
}
$driverOptions[PDO::MYSQL_ATTR_INIT_COMMAND] .=';';
$adapterParamaters['port'] = $this->config->get('port', 3306);
$defaultPort = 3306;
break;
case 'oci':
$adapter = 'Oracle';
@ -186,13 +186,15 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
$adapterParamaters['driver_options'] = array(
'lob_as_string' => true
);
$defaultPort = 1521;
break;
case 'oracle':
$adapter = 'Pdo_Oci';
$defaultPort = 1521;
break;
case 'pgsql':
$adapter = 'Pdo_Pgsql';
$adapterParamaters['port'] = $this->config->get('port', 5432);
$defaultPort = 5432;
break;
default:
throw new ConfigurationError(
@ -200,6 +202,7 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp
$this->dbType
);
}
$adapterParamaters['port'] = $this->config->get('port', $defaultPort);
$this->dbAdapter = Zend_Db::factory($adapter, $adapterParamaters);
$this->dbAdapter->setFetchMode(Zend_Db::FETCH_OBJ);
// TODO(el/tg): The profiler is disabled per default, why do we disable the profiler explicitly?