composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-09-18 23:49:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°9639 - Refactor data feature removal logic and update database queries for consistency

Browse Source
This commit is contained in:
Eric Espie
2026-06-25 17:20:17 +02:00
parent 4d2da15c96
commit dc3f6a9f72
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
datamodels/2.x/combodo-data-feature-removal/src/Controller/DataFeatureRemovalController.php
View File

@@ -224,6 +224,7 @@ class DataFeatureRemovalController extends Controller
$bIsDirEmpty = count(scandir($sBuildDir)) === 2;
if ($bIsDirEmpty || $bForceCompilation) {
Session::Unset('bForceCompilation');
DataFeatureRemovalLog::Debug(
__METHOD__,
null,

31
datamodels/2.x/combodo-data-feature-removal/src/Service/StaticDeletionPlan.php
View File

@@ -26,9 +26,6 @@ class StaticDeletionPlan
*
* @return array<\Combodo\iTop\DataFeatureRemoval\Entity\DataCleanupSummaryEntity>
* @throws \CoreException
* @throws \CoreUnexpectedValue
* @throws \MySQLException
* @throws \Combodo\iTop\DataFeatureRemoval\Helper\DataFeatureRemovalException
*/
public function GetCleanupSummary(?array $aClasses): array
{
@@ -160,21 +157,21 @@ SQL;
*/
public function UpdateHierarchicalExtKey(string $sRemoteClass, string $sExtKeyAttCode, string $sIdsToRemoveInTargetClass): DeletionPlanItem
{
[$sDBTable, $sDBField] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
[$sDBTable, $sDBField, $sDBKey] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
$sUpdateSQL = <<<SQL
UPDATE $sDBTable SET updated.$sDBField = removed.$sDBField
FROM $sDBTable AS updated
INNER JOIN $sDBTable AS removed ON updated.$sDBField = removed.id
WHERE removed.id IN ($sIdsToRemoveInTargetClass)
INNER JOIN $sDBTable AS removed ON updated.$sDBField = removed.$sDBKey
WHERE removed.$sDBKey IN ($sIdsToRemoveInTargetClass)
SQL;
$sSQL = <<<SQL
SELECT id
SELECT $sDBKey
FROM $sDBTable AS updated
INNER JOIN $sDBTable AS removed ON updated.$sDBField = removed.id
WHERE removed.id IN ($sIdsToRemoveInTargetClass)
INNER JOIN $sDBTable AS removed ON updated.$sDBField = removed.$sDBKey
WHERE removed.$sDBKey IN ($sIdsToRemoveInTargetClass)
SQL;
$aIds = CMDBSource::QueryToCol($sSQL, 'id');
$aIds = CMDBSource::QueryToCol($sSQL, $sDBKey);
return new DeletionPlanItem([$sExtKeyAttCode => $sUpdateSQL], $aIds);
}
@@ -193,10 +190,10 @@ SQL;
if (\utils::IsNullOrEmptyString($sIdsToRemoveInTargetClass)) {
return [];
}
[$sDBTable, $sDBField] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
$sSQL = "SELECT id FROM $sDBTable WHERE $sDBField IN ($sIdsToRemoveInTargetClass)";
[$sDBTable, $sDBField, $sDBKey] = $this->GetDBInfoForAttcode($sRemoteClass, $sExtKeyAttCode);
$sSQL = "SELECT $sDBKey FROM $sDBTable WHERE $sDBField IN ($sIdsToRemoveInTargetClass)";
return CMDBSource::QueryToCol($sSQL, 'id');
return CMDBSource::QueryToCol($sSQL, $sDBKey);
}
/**
@@ -209,8 +206,9 @@ SQL;
public function GetInitialClassDeletionPlan(string $sClass): DeletionPlanItem
{
$sTable = MetaModel::DBGetTable($sClass);
$sSQL = "SELECT id FROM $sTable";
$aIds = CMDBSource::QueryToCol($sSQL, 'id');
$sDBKey = MetaModel::DBGetKey($sClass);
$sSQL = "SELECT $sDBKey FROM $sTable";
$aIds = CMDBSource::QueryToCol($sSQL, $sDBKey);
$sDeleteSQL = "DELETE FROM $sTable";
return new DeletionPlanItem([$sDeleteSQL], $aIds);
@@ -232,7 +230,8 @@ SQL;
$sRealTable = MetaModel::DBGetTable($sRealClass);
$oAttDef = MetaModel::GetAttributeDef($sRealClass, $sExtKeyAttCode);
$sSQLAttCode = array_keys($oAttDef->GetSQLColumns())[0];
return [$sRealTable, $sSQLAttCode];
$sDBKey = MetaModel::DBGetKey($sRemoteClass);
return [$sRealTable, $sSQLAttCode, $sDBKey];
}
}

2
setup/unattended-install/xml_setup/upgrade.xml
View File

@@ -41,5 +41,5 @@
</selected_modules>
<selected_extensions type="array">
</selected_extensions>
<use_symbolic_links>on</use_symbolic_links>
<use_symbolic_links>off</use_symbolic_links>
</installation>