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

Fix first column validate (#9683)

Browse Source 
* Fix first column validate

* fix index, remove vardump
This commit is contained in:
Tony Murray
2019-01-17 08:58:26 -06:00
committed by GitHub
parent a991270fa7
commit e403d01967
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LibreNMS/Validations/Database.php
View File

@ -171,7 +171,7 @@ class Database extends BaseValidation
unset($data['Indexes']['PRIMARY']);
$primary = true;
}
$schema_update[] = $this->addColumnSql($table, $cdata, $data['Columns'][$index - 1]['Field'], $primary);
$schema_update[] = $this->addColumnSql($table, $cdata, isset($data['Columns'][$index - 1]) ? $data['Columns'][$index - 1]['Field'] : null, $primary);
} elseif ($cdata !== $current_columns[$column]) {
$validator->fail("Database: incorrect column ($table/$column)");
$schema_update[] = $this->updateTableSql($table, $column, $cdata);
@ -228,10 +228,9 @@ class Database extends BaseValidation
private function addTableSql($table, $table_schema)
{
$columns = array_map(array($this, 'columnToSql'), $table_schema['Columns']);
$indexes = array_map(array($this, 'indexToSql'), $table_schema['Indexes']);
$indexes = array_map(array($this, 'indexToSql'), isset($table_schema['Indexes']) ? $table_schema['Indexes'] : []);
$def = implode(', ', array_merge(array_values((array)$columns), array_values((array)$indexes)));
var_dump($def);
return "CREATE TABLE `$table` ($def);";
}