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

Db: Set MySQL server SQL modes to behave closer to ANSI SQL 

Was already implemented but someone dropped it accidentally
This commit is contained in:
Eric Lippmann 2013-08-21 14:40:37 +02:00
parent 525bb2382d
commit d813ca62c5
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/Icinga/Application/DbAdapterFactory.php
View File

@ -252,10 +252,16 @@ class DbAdapterFactory implements ConfigAwareFactory
*/ */
private static function getPdoMysqlOptions(array $options) private static function getPdoMysqlOptions(array $options)
{ {
// To get response for lazy sql statements /*
* Set MySQL server SQL modes to behave as closely as possible to Oracle and PostgreSQL. Note that the
* ONLY_FULL_GROUP_BY mode is left on purpose because MySQL requires you to specify all non-aggregate columns
* in the group by list even if the query is grouped by the master table's primary key which is valid
* ANSI SQL though. Further in that case the query plan would suffer if you add more columns to the group by
* list.
*/
$options['driver_options'][PDO::MYSQL_ATTR_INIT_COMMAND] = $options['driver_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_DATE,ERROR_FOR_DIVISION_BY_ZERO,'
. 'NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION\';'; . 'NO_AUTO_CREATE_USER,ANSI_QUOTES,PIPES_AS_CONCAT,NO_ENGINE_SUBSTITUTION\';';
if (!isset($options['port'])) { if (!isset($options['port'])) {
$options['port'] = 3306; $options['port'] = 3306;

10
test/php/library/Icinga/Application/DbAdapterFactoryTest.php
View File

@ -99,10 +99,12 @@ class DbAdapterFactoryTest extends \PHPUnit_Framework_TestCase
Zend_Db::FETCH_MODE => Zend_Db::FETCH_OBJ Zend_Db::FETCH_MODE => Zend_Db::FETCH_OBJ
), ),
'driver_options' => array( 'driver_options' => array(
PDO::ATTR_TIMEOUT => 2, PDO::ATTR_TIMEOUT => 2,
PDO::ATTR_CASE => PDO::CASE_LOWER, PDO::ATTR_CASE => PDO::CASE_LOWER,
PDO::MYSQL_ATTR_INIT_COMMAND => 'SET SESSION SQL_MODE=\'STRICT_ALL_TABLES,NO_ZERO_IN_DATE,' PDO::MYSQL_ATTR_INIT_COMMAND =>
. 'NO_ZERO_DATE,NO_ENGINE_SUBSTITUTION\';' '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' => 3306 'port' => 3306
), ),