ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove IF EXISTS condition on rename

Browse source 
Know that the column exists so this is unnecessary and fails in MariaDb 5.5
This commit is contained in:
steve-lad 2021-08-04 12:36:18 +02:00
parent b133b2bc3a
commit f1cc0f1bf6
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
install.php
View file

@ -323,6 +323,7 @@ function Get_DB_config($sccp_compatible)
$db_config_v4['sccpdevice'] = array_merge($db_config_v4['sccpdevice'],$db_config_v5['sccpdevice']); $db_config_v4['sccpdevice'] = array_merge($db_config_v4['sccpdevice'],$db_config_v5['sccpdevice']);
$db_config_v4['sccpline'] = array_merge($db_config_v4['sccpline'],$db_config_v5['sccpline']); $db_config_v4['sccpline'] = array_merge($db_config_v4['sccpline'],$db_config_v5['sccpline']);
$db_config_v4['sccpsettings'] = $db_config_v5['sccpsettings']; $db_config_v4['sccpsettings'] = $db_config_v5['sccpsettings'];
dbug($db_config_v4['sccpdevice']);
} }
return $db_config_v4; return $db_config_v4;
} }
@ -448,14 +449,14 @@ function InstallDB_updateSchema($db_config)
// Does a create exist for newName // Does a create exist for newName
if (!empty($tab_modif[$fld_id_newName]['create'])) { if (!empty($tab_modif[$fld_id_newName]['create'])) {
//carry the attributes from the new create to the rename //carry the attributes from the new create to the rename
$sql_rename .= "CHANGE COLUMN IF EXISTS {$fld_id} {$fld_id_newName} {$tab_modif[$fld_id_newName]['create']}, "; $sql_rename .= "CHANGE COLUMN {$fld_id} {$fld_id_newName} {$tab_modif[$fld_id_newName]['create']}, ";
// do not create newName as modifying existing // do not create newName as modifying existing
unset($tab_modif[$fld_id_newName]['create']); unset($tab_modif[$fld_id_newName]['create']);
} else { } else {
// add current attributes to the new name. // add current attributes to the new name.
$existingAttrs = strtoupper($tabl_data['Type']).(($tabl_data['Null'] == 'NO') ?' NOT NULL': ' NULL') . $existingAttrs = strtoupper($tabl_data['Type']).(($tabl_data['Null'] == 'NO') ?' NOT NULL': ' NULL') .
((empty($tabl_data['Default']))?'': ' DEFAULT ' . "'" . $tabl_data['Default']."'"); ((empty($tabl_data['Default']))?'': ' DEFAULT ' . "'" . $tabl_data['Default']."'");
$sql_rename .= "CHANGE COLUMN IF EXISTS {$fld_id} {$fld_id_newName} {$existingAttrs}, "; $sql_rename .= "CHANGE COLUMN {$fld_id} {$fld_id_newName} {$existingAttrs}, ";
} }
unset($tab_modif[$fld_id]['rename']); unset($tab_modif[$fld_id]['rename']);
$count_modify ++; $count_modify ++;
@ -496,6 +497,7 @@ function InstallDB_updateSchema($db_config)
if (!empty($sql_rename)) { if (!empty($sql_rename)) {
outn("<li>" . _("Renaming table columns ") . $tabl_name ."</li>"); outn("<li>" . _("Renaming table columns ") . $tabl_name ."</li>");
$sql_rename = "ALTER TABLE {$tabl_name} " . substr($sql_rename, 0, -2); $sql_rename = "ALTER TABLE {$tabl_name} " . substr($sql_rename, 0, -2);
dbug($sql_rename);
try { try {
$check = $db->query($sql_rename); $check = $db->query($sql_rename);
} catch (\Exception $e) { } catch (\Exception $e) {

2
module.xml
View file

@ -1,7 +1,7 @@
<module> <module>
<rawname>sccp_manager</rawname> <rawname>sccp_manager</rawname>
<name>SCCP Manager</name> <name>SCCP Manager</name>
<version>14.3.0.2</version> <version>14.3.0.4</version>
<type>setup</type> <type>setup</type>
<category>SCCP Connectivity</category> <category>SCCP Connectivity</category>
<publisher>Steve Lad, Alex GP</publisher> <publisher>Steve Lad, Alex GP</publisher>