mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed NO_AUTO_CREATE_USER from mysql strict to support MySQL 8 (#9668)

Browse Source 
* Removed NO_AUTO_CREATE_USER from mysql strict

* Fixed tests
This commit is contained in:
Neil Lathwood
2019-01-15 07:21:00 +00:00
committed by Tony Murray
parent 394c40e541
commit f8cf6a93b3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LibreNMS/DB/Eloquent.php
View File

@@ -95,7 +95,7 @@ class Eloquent
{ {
if (self::isConnected()) { if (self::isConnected()) {
if ($strict) { if ($strict) {
self::DB()->getPdo()->exec("SET sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'"); self::DB()->getPdo()->exec("SET sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'");
} else { } else {
self::DB()->getPdo()->exec("SET sql_mode=''"); self::DB()->getPdo()->exec("SET sql_mode=''");
} }

2
tests/DBSetupTest.php
View File

@@ -115,7 +115,7 @@ class DBSetupTest extends DBTestCase
public function testSqlMode() public function testSqlMode()
{ {
$this->assertEquals( $this->assertEquals(
'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION', 'ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION',
dbFetchCell("SELECT @@sql_mode") dbFetchCell("SELECT @@sql_mode")
); );
} }