MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [temporary] Dirty fix for the diagnostic page failing on MySQL < 5.6

pull/5404/head
iglocska 2019-11-13 10:05:25 +01:00
parent 1d709c69ec
commit a7aad6f042
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Model/Server.php
View File

@ -4330,7 +4330,7 @@ class Server extends AppModel
'data_type',
'character_maximum_length',
'numeric_precision',
'datetime_precision',
//'datetime_precision',
'collation_name'
)
){
@ -4371,7 +4371,7 @@ class Server extends AppModel
// perform schema comparison for table's columns
$expectedColumnKeys = array();
$keyedExpectedColumn = array();
foreach($columns as $column) {
foreach($columns as $columnName => $column) {
$expectedColumnKeys[] = $column[0];
$keyedExpectedColumn[$column[0]] = $column;
}
@ -4389,7 +4389,12 @@ class Server extends AppModel
'column_name' => $additionalKeys
);
}
/*dirty fix*/
foreach ($keyedExpectedColumn as $k => $v) {
unset($keyedExpectedColumn[$k][5]);
$keyedExpectedColumn[$k] = array_values($keyedExpectedColumn[$k]);
}
/*dirty fix*/
foreach ($keyedExpectedColumn as $columnName => $column) {
if (isset($keyedActualColumn[$columnName])) {
$colDiff = array_diff($column, $keyedActualColumn[$columnName]);