composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 16:48:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a regression in the deletion (and simplified the algorithm, though more queries will be issued)

Browse Source 
SVN:trunk[1142]
This commit is contained in:
Romain Quetiez
2011-03-23 08:38:49 +00:00
parent 8f4ee29c69
commit 3790c8f7d5
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/cmdbsource.class.inc.php
View File

@@ -243,6 +243,11 @@ class CMDBSource
return false;
}
public static function DeleteFrom($sSQLQuery)
{
self::Query($sSQLQuery);
}
public static function QueryToScalar($sSql)
{
$result = mysql_query($sSql, self::$m_resDBLink);

29
core/dbobject.class.php
View File

@@ -1183,18 +1183,37 @@ abstract class DBObject
}
}
private function DBDeleteSingleTable($sTableClass)
{
$sTable = MetaModel::DBGetTable($sTableClass);
// Abstract classes or classes having no specific attribute do not have an associated table
if ($sTable == '') return;
$sPKField = '`'.MetaModel::DBGetKey($sTableClass).'`';
$sKey = CMDBSource::Quote($this->m_iKey);
$sDeleteSQL = "DELETE FROM `$sTable` WHERE $sPKField = $sKey";
CMDBSource::DeleteFrom($sDeleteSQL);
}
private function DBDeleteInternal()
{
$sClass = get_class($this);
foreach(MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL) as $sParentClass)
{
$this->DBDeleteSingleTable($sParentClass);
}
}
// Delete a record
public function DBDelete()
{
$oFilter = new DBObjectSearch(get_class($this));
$oFilter->AddCondition('id', $this->m_iKey, '=');
$this->OnDelete();
$sSQL = MetaModel::MakeDeleteQuery($oFilter);
if (!MetaModel::DBIsReadOnly())
{
CMDBSource::Query($sSQL);
$this->DBDeleteInternal();
}
$this->AfterDelete();