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

Code cleanup, fixed and extended MySQL SQL_MODE

This commit is contained in:
Thomas Gelf 2013-07-29 13:24:25 +00:00
parent d5d0da6b1b
commit f2c6a66de7
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library/Icinga/Data/Db/Connection.php
View File

@ -3,6 +3,10 @@
namespace Icinga\Data\Db; namespace Icinga\Data\Db;
use Icinga\Data\DatasourceInterface; use Icinga\Data\DatasourceInterface;
use Icinga\Exception\ConfigurationError;
use Zend_Config as ZfConfig;
use Zend_Db as ZfDb;
use PDO;
class Connection implements DatasourceInterface class Connection implements DatasourceInterface
{ {
@ -10,7 +14,7 @@ class Connection implements DatasourceInterface
protected $config; protected $config;
protected $dbtype; protected $dbtype;
public function __construct(\Zend_Config $config = null) public function __construct(ZfConfig $config = null)
{ {
$this->config = $config; $this->config = $config;
$this->connect(); $this->connect();
@ -41,24 +45,24 @@ class Connection implements DatasourceInterface
$this->dbtype = $this->config->get('dbtype', 'mysql'); $this->dbtype = $this->config->get('dbtype', 'mysql');
$options = array( $options = array(
\Zend_Db::AUTO_QUOTE_IDENTIFIERS => false, ZfDb::AUTO_QUOTE_IDENTIFIERS => false,
\Zend_Db::CASE_FOLDING => \Zend_Db::CASE_LOWER ZfDb::CASE_FOLDING => ZfDb::CASE_LOWER
); );
$drv_options = array( $drv_options = array(
\PDO::ATTR_TIMEOUT => 2, PDO::ATTR_TIMEOUT => 2,
// TODO: Check whether LC is useful. Zend_Db does fetchNum for Oci: // TODO: Check whether LC is useful. Zend_Db does fetchNum for Oci:
\PDO::ATTR_CASE => \PDO::CASE_LOWER PDO::ATTR_CASE => PDO::CASE_LOWER
// TODO: ATTR_ERRMODE => ERRMODE_EXCEPTION vs ERRMODE_SILENT // TODO: ATTR_ERRMODE => ERRMODE_EXCEPTION vs ERRMODE_SILENT
); );
switch ($this->dbtype) { switch ($this->dbtype) {
case 'mysql': case 'mysql':
$adapter = 'Pdo_Mysql'; $adapter = 'Pdo_Mysql';
$drv_options[\PDO::MYSQL_ATTR_INIT_COMMAND] = $drv_options[PDO::MYSQL_ATTR_INIT_COMMAND] =
"SET SESSION SQL_MODE='STRICT_ALL_TABLES,NO_ZERO_IN_DATE," "SET SESSION SQL_MODE='STRICT_ALL_TABLES,NO_ZERO_IN_DATE,"
."NO_ZERO_IN_DATE,ANSI,TRADITIONAL,ONLY_FULL_GROUP_BY," . "NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION,PIPES_AS_CONCAT,"
. "NO_ENGINE_SUBSTITUTION';"; . "ANSI_QUOTES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER';";
// Not using ONLY_FULL_GROUP_BY as of performance impact // Not using ONLY_FULL_GROUP_BY as of performance impact
// TODO: NO_ZERO_IN_DATE as been added with 5.1.11. Is it // TODO: NO_ZERO_IN_DATE as been added with 5.1.11. Is it
// ignored by other versions? // ignored by other versions?
@ -72,7 +76,7 @@ class Connection implements DatasourceInterface
$adapter = 'Pdo_Oci'; $adapter = 'Pdo_Oci';
// $adapter = 'Oracle'; // $adapter = 'Oracle';
$port = $this->config->get('port', 1521); $port = $this->config->get('port', 1521);
// $drv_options[\PDO::ATTR_STRINGIFY_FETCHES] = true; // $drv_options[PDO::ATTR_STRINGIFY_FETCHES] = true;
if ($adapter === 'Oracle') { if ($adapter === 'Oracle') {
// Unused right now // Unused right now
@ -86,7 +90,7 @@ class Connection implements DatasourceInterface
break; break;
default: default:
throw new \Exception(sprintf( throw new ConfigurationError(sprintf(
'Backend "%s" is not supported', $type 'Backend "%s" is not supported', $type
)); ));
} }
@ -102,13 +106,13 @@ class Connection implements DatasourceInterface
if ($this->dbtype === 'oracle') { if ($this->dbtype === 'oracle') {
$attributes['persistent'] = true; $attributes['persistent'] = true;
} }
$this->db = \Zend_Db::factory($adapter, $attributes); $this->db = ZfDb::factory($adapter, $attributes);
if ($adapter === 'Oracle') { if ($adapter === 'Oracle') {
$this->db->setLobAsString(false); $this->db->setLobAsString(false);
} }
// TODO: Zend_Db::FETCH_ASSOC for Oracle? // TODO: ZfDb::FETCH_ASSOC for Oracle?
$this->db->setFetchMode(\Zend_Db::FETCH_OBJ); $this->db->setFetchMode(ZfDb::FETCH_OBJ);
} }
} }