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

Merge branch 'feature/validate-NO_ZERO_IN_DATE-4255' 

fixes #4255
This commit is contained in:
Jannis Moßhammer 2013-08-02 15:11:24 +02:00
parent e9b002bdcd 06fc3e395e
commit ce4ea10a0a
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,18 +59,10 @@ class Connection implements DatasourceInterface
switch ($this->dbtype) { switch ($this->dbtype) {
case 'mysql': case 'mysql':
$adapter = 'Pdo_Mysql'; $adapter = 'Pdo_Mysql';
/* Set MySQL server SQL modes to behave as closely as possible to Oracle and $drv_options[\PDO::MYSQL_ATTR_INIT_COMMAND] =
* PostgreSQL. Note that the ONLY_FULL_GROUP_BY mode is left on purpose because "SET SESSION SQL_MODE='STRICT_ALL_TABLES,NO_ZERO_IN_DATE,"
* MySQL requires you to specify all non-aggregate columns in the group by list . "NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION';";
* even if the query is grouped by the master table's primary key which is valid // Not using ONLY_FULL_GROUP_BY as of performance impact
* ANSI SQL though. Further in that case the query plan would suffer if you add more
* columns to the group by list.
* @TODO(#4462): NO_ZERO_IN_DATE has been added with MySQL version 5.1.11. Is it
* safe to pass this option since (older) versions ignore modes unknown by this time?
*/
$drv_ptions[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION SQL_MODE='"
. "STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,"
. "NO_AUTO_CREATE_USER,ANSI_QUOTES,PIPES_AS_CONCAT,NO_ENGINE_SUBSTITUTION';";
$port = $this->config->get('port', 3306); $port = $this->config->get('port', 3306);
break; break;
case 'pgsql': case 'pgsql':