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: Fixed validation sql for primary keys and first columns (#8453)

Browse Source 
* Fix validation sql for primary keys and first columns
Remove extra space in generated sql :D

* Update Database.php
This commit is contained in:
Tony Murray
2018-03-23 02:51:34 -05:00
committed by Neil Lathwood
parent faf48311b2
commit 0c0a70cc39
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
LibreNMS/Validations/Database.php
View File

@@ -153,7 +153,13 @@ FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '" . Config::get('db_name'
$column = $cdata['Field'];
if (empty($current_columns[$column])) {
$validator->fail("Database: missing column ($table/$column)");
$schema_update[] = $this->addColumnSql($table, $cdata, $data['Columns'][$index - 1]['Field']);
$primary = false;
if ($data['Indexes']['PRIMARY']['Columns'] == [$column]) {
// include the primary index with the add statement
unset($data['Indexes']['PRIMARY']);
$primary = true;
}
$schema_update[] = $this->addColumnSql($table, $cdata, $data['Columns'][$index - 1]['Field'], $primary);
} elseif ($cdata !== $current_columns[$column]) {
$validator->fail("Database: incorrect column ($table/$column)");
$schema_update[] = $this->updateTableSql($table, $column, $cdata);
@@ -217,10 +223,15 @@ FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '" . Config::get('db_name'
return "CREATE TABLE `$table` ($def);";
}
private function addColumnSql($table, $schema, $previous_column)
private function addColumnSql($table, $schema, $previous_column, $primary = false)
{
$sql = "ALTER TABLE `$table` ADD " . $this->columnToSql($schema);
if (!empty($previous_column)) {
if ($primary) {
$sql .= ' PRIMARY KEY';
}
if (empty($previous_column)) {
$sql .= ' FIRST';
} else {
$sql .= " AFTER `$previous_column`";
}
return $sql . ';';
@@ -264,25 +275,27 @@ FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '" . Config::get('db_name'
*/
private function columnToSql($column_data)
{
$segments = ["`${column_data['Field']}`", $column_data['Type']];
$segments[] = $column_data['Null'] ? 'NULL' : 'NOT NULL';
if (isset($column_data['Default'])) {
if ($column_data['Default'] === 'CURRENT_TIMESTAMP') {
$segments[] = 'DEFAULT CURRENT_TIMESTAMP';
} elseif ($column_data['Default'] == 'NULL') {
$segments[] = 'DEFAULT NULL';
} else {
$segments[] = "DEFAULT '${column_data['Default']}'";
}
}
if ($column_data['Extra'] == 'on update current_timestamp()') {
$extra = 'on update CURRENT_TIMESTAMP';
$segments[] = 'on update CURRENT_TIMESTAMP';
} else {
$extra = $column_data['Extra'];
$segments[] = $column_data['Extra'];
}
$null = $column_data['Null'] ? 'NULL' : 'NOT NULL';
if (!isset($column_data['Default'])) {
$default = '';
} elseif ($column_data['Default'] === 'CURRENT_TIMESTAMP') {
$default = 'DEFAULT CURRENT_TIMESTAMP';
} elseif ($column_data['Default'] == 'NULL') {
$default = 'DEFAULT NULL';
} else {
$default = "DEFAULT '${column_data['Default']}'";
}
return trim("`${column_data['Field']}` ${column_data['Type']} $null $default $extra");
return implode(' ', $segments);
}
/**