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 an issue with table creation (named indexes merged) (#6366)

Browse Source
This commit is contained in:
Tony Murray
2017-04-05 11:19:22 -05:00
committed by GitHub
parent 0fd0b7cd6c
commit 907a601c1d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
validate.php
View File

@ -206,8 +206,9 @@ if (is_file('misc/db_schema.yaml')) {
$columns = array_map('column_schema_to_sql', $data['Columns']); $columns = array_map('column_schema_to_sql', $data['Columns']);
$indexes = array_map('index_schema_to_sql', $data['Indexes']); $indexes = array_map('index_schema_to_sql', $data['Indexes']);
$def = implode(', ', array_merge(array_values($columns), array_values($indexes)));
$schema_update[] = "CREATE TABLE `$table` (" . implode(', ', array_merge($columns, $indexes)). ');'; $schema_update[] = "CREATE TABLE `$table` ($def);";
} else { } else {
$previous_column = ''; $previous_column = '';
foreach ($data['Columns'] as $column => $cdata) { foreach ($data['Columns'] as $column => $cdata) {