From e403d019679b829dcac9303152aa532b6f6132b4 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Thu, 17 Jan 2019 08:58:26 -0600 Subject: [PATCH] Fix first column validate (#9683) * Fix first column validate * fix index, remove vardump --- LibreNMS/Validations/Database.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/LibreNMS/Validations/Database.php b/LibreNMS/Validations/Database.php index 88bea6a3ce..9b362f13a5 100644 --- a/LibreNMS/Validations/Database.php +++ b/LibreNMS/Validations/Database.php @@ -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);"; }