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

Include the index name so the manual sql fix validates. (#6365)

Browse Source
This commit is contained in:
Tony Murray
2017-04-05 10:20:14 -05:00
committed by GitHub
parent 2076e3655f
commit 0fd0b7cd6c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
includes/functions.php
View File

@@ -2254,18 +2254,16 @@ function column_schema_to_sql($column_data)
function index_schema_to_sql($index_data) function index_schema_to_sql($index_data)
{ {
if ($index_data['Name'] == 'PRIMARY') { if ($index_data['Name'] == 'PRIMARY') {
$index = 'PRIMARY KEY'; $index = 'PRIMARY KEY (%s)';
} elseif ($index_data['Unique']) { } elseif ($index_data['Unique']) {
$index = 'UNIQUE'; $index = "UNIQUE `{$index_data['Name']}` (%s)";
} else { } else {
$index = 'INDEX'; $index = "INDEX `{$index_data['Name']}` (%s)";
} }
$type = $index_data['Type'] != 'BTREE' ? " USING {$index_data['Type']}" : '';
$columns = implode(',', array_map(function ($col) { $columns = implode(',', array_map(function ($col) {
return "`$col`"; return "`$col`";
}, $index_data['Columns'])); }, $index_data['Columns']));
return "$index ($columns)$type"; return sprintf($index, $columns);
} }