composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°7130 - When moving data in the setup from multiple columns, prevent later data from erasing previous data when it's NULL

Browse Source
This commit is contained in:
Stephen Abello
2024-03-11 16:11:12 +01:00
parent 5e9b4da68c
commit 722765c0aa
2 changed files with 140 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
setup/moduleinstaller.class.inc.php
View File

@@ -249,8 +249,9 @@ abstract class ModuleInstallerAPI
* @throws \MySQLHasGoneAwayException
*
* @since 3.2.0 N°7130 Add parameter $bIgnoreExistingDstColumn
* @since 3.2.0 No longer copy NULL data in order to avoid writing over existing data
*/
public static function MoveColumnInDB($sOrigTable, $sOrigColumn, $sDstTable, $sDstColumn, $bIgnoreExistingDstColumn = false)
public static function MoveColumnInDB($sOrigTable, $sOrigColumn, $sDstTable, $sDstColumn, bool $bIgnoreExistingDstColumn = false)
{
if (!MetaModel::DBExists(false))
{
@@ -279,7 +280,7 @@ abstract class ModuleInstallerAPI
}
// Copy the data
$sQueryUpdate = "UPDATE `{$sDstTable}` AS d LEFT JOIN `{$sOrigTable}` AS o ON d.id = o.id SET d.`{$sDstColumn}` = o.`{$sOrigColumn}` WHERE 1";
$sQueryUpdate = "UPDATE `{$sDstTable}` AS d LEFT JOIN `{$sOrigTable}` AS o ON d.id = o.id SET d.`{$sDstColumn}` = o.`{$sOrigColumn}` WHERE o.`{$sOrigColumn}` IS NOT NULL";
CMDBSource::Query($sQueryUpdate);
// Drop original field