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

chg: [dbDiagnostic] Diagnostic result is stored in a keyed array instead 

of indexed array
pull/5404/head
mokaddem 2019-11-13 12:21:19 +01:00
parent a7aad6f042
commit 28abffd6a2
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
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'
)
){
@ -4347,7 +4347,7 @@ class Server extends AppModel
WHERE table_schema = '%s' AND table_name = '%s'", implode(',', $tableColumnNames), $this->getDataSource()->config['database'], $table);
$sqlResult = $this->query($sqlSchema);
foreach ($sqlResult as $column_schema) {
$dbActualSchema[$table][] = array_values($column_schema['columns']);
$dbActualSchema[$table][] = $column_schema['columns'];
}
}
}
@ -4371,15 +4371,15 @@ class Server extends AppModel
// perform schema comparison for table's columns
$expectedColumnKeys = array();
$keyedExpectedColumn = array();
foreach($columns as $columnName => $column) {
$expectedColumnKeys[] = $column[0];
$keyedExpectedColumn[$column[0]] = $column;
foreach($columns as $column) {
$expectedColumnKeys[] = $column['column_name'];
$keyedExpectedColumn[$column['column_name']] = $column;
}
$existingColumnKeys = array();
$keyedActualColumn = array();
foreach($dbActualSchema[$tableName] as $column) {
$existingColumnKeys[] = $column[0];
$keyedActualColumn[$column[0]] = $column;
$existingColumnKeys[] = $column['column_name'];
$keyedActualColumn[$column['column_name']] = $column;
}
$additionalKeysInActualSchema = array_diff($existingColumnKeys, $expectedColumnKeys);
@ -4389,19 +4389,13 @@ 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]);
$colDiff = array_diff_assoc($column, $keyedActualColumn[$columnName]);
if (count($colDiff) > 0) {
$dbDiff[$tableName][] = array(
'description' => sprintf(__('Column `%s` is different'), $columnName),
'column_name' => $column[0],
'column_name' => $column['column_name'],
'actual' => $keyedActualColumn[$columnName],
'expected' => $column
);

10
app/View/Elements/healthElements/db_schema_status.ctp
View File

@ -142,11 +142,17 @@ $(document).ready(function() {
var $row = $(this);
var tableName = $row.data('table');
var columnId = $row.data('index');
var expectedArray = [];
var actualArray = [];
dbSchemaDiagnosticsColumns.forEach(function(columnName) {
expectedArray.push(dbSchemaDiagnostics[tableName][columnId].expected[columnName]);
actualArray.push(dbSchemaDiagnostics[tableName][columnId].actual[columnName]);
});
var popoverHtml = arrayToNestedTable(
dbSchemaDiagnosticsColumns,
[
dbSchemaDiagnostics[tableName][columnId].expected,
dbSchemaDiagnostics[tableName][columnId].actual,
expectedArray,
actualArray,
]
);
return popoverHtml;

2
db_schema.json
View File

File diff suppressed because one or more lines are too long