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

N°3572 - Fix Data Integrity tab results display

Browse Source 
- fix synchrodatasource SQL definitions
- fix Hierarchical keys warnings due to bad parameters
This commit is contained in:
Eric Espie
2021-09-30 14:52:42 +02:00
parent c3d23981fb
commit 4b8ef4f919
3 changed files with 52 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/attributedef.class.inc.php
View File

@@ -1793,7 +1793,7 @@ class AttributeLinkedSet extends AttributeDefinition
public function GetImportColumns()
{
$aColumns = array();
$aColumns[$this->GetCode()] = 'TEXT';
$aColumns[$this->GetCode()] = 'TEXT'.CMDBSource::GetSqlStringColumnDefinition();
return $aColumns;
}
@@ -5994,7 +5994,7 @@ class AttributeDateTime extends AttributeDBField
{
// Allow an empty string to be a valid value (synonym for "reset")
$aColumns = array();
$aColumns[$this->GetCode()] = 'VARCHAR(19)';
$aColumns[$this->GetCode()] = 'VARCHAR(19)'.CMDBSource::GetSqlStringColumnDefinition();
return $aColumns;
}
@@ -6482,7 +6482,7 @@ class AttributeDate extends AttributeDateTime
{
// Allow an empty string to be a valid value (synonym for "reset")
$aColumns = array();
$aColumns[$this->GetCode()] = 'VARCHAR(10)';
$aColumns[$this->GetCode()] = 'VARCHAR(10)'.CMDBSource::GetSqlStringColumnDefinition();
return $aColumns;
}

10
core/metamodel.class.php
View File

@@ -4531,15 +4531,15 @@ abstract class MetaModel
/**
* Check (and updates if needed) the hierarchical keys
*
* @param boolean $bDiagnosticsOnly If true only a diagnostic pass will be run, returning true or false
* @param boolean $bVerbose Displays some information about what is done/what needs to be done
* @param boolean $bForceComputation If true, the _left and _right parameters will be recomputed even if some
* @param bool $bDiagnosticsOnly If true only a diagnostic pass will be run, returning true or false
* @param bool $bVerbose Displays some information about what is done/what needs to be done
* @param bool $bForceComputation If true, the _left and _right parameters will be recomputed even if some
* values already exist in the DB
*
* @return bool
* @throws \CoreException
* @throws \Exception
*/
public static function CheckHKeys($bDiagnosticsOnly = false, $bVerbose = false, $bForceComputation = false)
public static function CheckHKeys(bool $bDiagnosticsOnly = false, bool $bVerbose = false, bool $bForceComputation = false)
{
$bChangeNeeded = false;
foreach(self::GetClasses() as $sClass)

123
synchro/synchrodatasource.class.inc.php
View File

@@ -1051,28 +1051,22 @@ EOF
{
$bFixNeeded = false;
$bTriggerRebuildNeeded = false;
$aMissingFields = array();
$aMissingFields = [];
$oAttributeSet = $this->Get('attribute_list');
$aAttributes = array();
$aAttributes = [];
while ($oAttribute = $oAttributeSet->Fetch())
{
while ($oAttribute = $oAttributeSet->Fetch()) {
$sAttCode = $oAttribute->Get('attcode');
if (MetaModel::IsValidAttCode($this->GetTargetClass(), $sAttCode))
{
if (MetaModel::IsValidAttCode($this->GetTargetClass(), $sAttCode)) {
$aAttributes[$sAttCode] = $oAttribute;
}
else
{
} else {
// Old field remaining
$bTriggerRebuildNeeded = true;
if ($bVerbose)
{
if ($bVerbose) {
echo "Irrelevant field description for the field '$sAttCode', for the data synchro task ".$this->GetName().' ('.$this->GetKey()."), will be removed.\n";
}
$bFixNeeded = true;
if (!$bDiagnostics)
{
if (!$bDiagnostics) {
// Fix the issue
$oAttribute->DBDelete();
}
@@ -1080,40 +1074,31 @@ EOF
}
$sTable = $this->GetDataTable();
foreach ($this->ListTargetAttributes() as $sAttCode => $oAttDef)
{
if (!isset($aAttributes[$sAttCode]))
{
foreach ($this->ListTargetAttributes() as $sAttCode => $oAttDef) {
if (!isset($aAttributes[$sAttCode])) {
$bFixNeeded = true;
$aMissingFields[] = $sAttCode;
$bTriggerRebuildNeeded = true;
// New field missing...
if ($bVerbose)
{
if ($bVerbose) {
echo "Missing field description for the field '$sAttCode', for the data synchro task ".$this->GetName().' ('.$this->GetKey()."), will be created with default values.\n";
}
if (!$bDiagnostics)
{
if (!$bDiagnostics) {
// Fix the issue
$oAttribute = $this->CreateSynchroAtt($sAttCode);
$oAttribute->DBInsert();
}
}
else
{
$aColumns = $this->GetSQLColumns(array($sAttCode));
foreach ($aColumns as $sColName => $sColumnDef)
{
} else {
$aColumns = $this->GetSQLColumns([$sAttCode]);
foreach ($aColumns as $sColName => $sColumnDef) {
$bOneColIsMissing = false;
if (!CMDBSource::IsField($sTable, $sColName))
{
if (!CMDBSource::IsField($sTable, $sColName)) {
$bFixNeeded = true;
$bOneColIsMissing = true;
if ($bVerbose)
{
if ($bVerbose) {
if (count($aColumns) > 1) {
echo "Missing column '$sColName', in the table '$sTable' for the data synchro task ".$this->GetName().' ('.$this->GetKey()."). The columns '".implode("', '",
$aColumns)." will be re-created.'.\n";
$aColumns)." will be added.'.\n";
} else {
echo "Missing column '$sColName', in the table '$sTable' for the data synchro task ".$this->GetName().' ('.$this->GetKey()."). The column '$sColName' will be added.\n";
}
@@ -1122,16 +1107,15 @@ EOF
$bFixNeeded = true;
$bOneColIsMissing = true;
if (count($aColumns) > 1) {
echo "Incorrect column '$sColName' (".CMDBSource::GetFieldType($sTable,
echo "Incorrect column '$sColName' (".CMDBSource::GetFieldSpec($sTable,
$sColName).' instead of '.$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName().' ('.$this->GetKey()."). The columns '".implode("', '",
$aColumns)." will be re-created.'.\n";
} else {
echo "Incorrect column '$sColName' (".CMDBSource::GetFieldType($sTable,
$sColName).' instead of '.$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName().' ('.$this->GetKey()."). The column '$sColName' will be added.\n";
echo "Incorrect column '$sColName' (".CMDBSource::GetFieldSpec($sTable,
$sColName).' instead of '.$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName().' ('.$this->GetKey()."). The column '$sColName' will be re-created.\n";
}
}
if ($bOneColIsMissing)
{
if ($bOneColIsMissing) {
$bTriggerRebuildNeeded = true;
$aMissingFields[] = $sAttCode;
}
@@ -1140,60 +1124,47 @@ EOF
}
$sDBName = MetaModel::GetConfig()->Get('db_name');
try
{
try {
// Note: as per the MySQL documentation, using information_schema behaves exactly like SHOW TRIGGERS (user privileges)
// and this is in fact the recommended way for better portability
$iTriggerCount = CMDBSource::QueryToScalar("select count(*) from information_schema.triggers where EVENT_OBJECT_SCHEMA='$sDBName' and EVENT_OBJECT_TABLE='$sTable'");
}
catch (Exception $e)
{
if ($bVerbose)
{
catch (Exception $e) {
if ($bVerbose) {
echo 'Failed to investigate on the synchro triggers (skipping the check): '.$e->getMessage().".\n";
}
// Ignore this error: consider that the trigger are there
$iTriggerCount = 3;
}
if ($iTriggerCount < 3)
{
if ($iTriggerCount < 3) {
$bFixNeeded = true;
$bTriggerRebuildNeeded = true;
if ($bVerbose)
{
if ($bVerbose) {
echo 'Missing trigger(s) for the data synchro task '.$this->GetName()." (table {$sTable}).\n";
}
}
$aRepairQueries = array();
$aRepairQueries = [];
if (count($aMissingFields) > 0)
{
if (count($aMissingFields) > 0) {
// The structure of the table needs adjusting
$aColumns = $this->GetSQLColumns($aMissingFields);
$aFieldDefs = array();
foreach ($aColumns as $sAttCode => $sColumnDef)
{
if (CMDBSource::IsField($sTable, $sAttCode))
{
$aFieldDefs = [];
foreach ($aColumns as $sAttCode => $sColumnDef) {
if (CMDBSource::IsField($sTable, $sAttCode)) {
$aRepairQueries[] = "ALTER TABLE `$sTable` CHANGE `$sAttCode` `$sAttCode` $sColumnDef";
}
else
{
} else {
$aFieldDefs[] = "`$sAttCode` $sColumnDef";
}
}
if (count($aFieldDefs) > 0)
{
if (count($aFieldDefs) > 0) {
$aRepairQueries[] = "ALTER TABLE `$sTable` ADD (".implode(',', $aFieldDefs).');';
}
if ($bDiagnostics)
{
if ($bVerbose)
{
echo "The structure of the table $sTable for the data synchro task ".$this->GetName().' ('.$this->GetKey().') must be altered (missing or incorrect fields: '.implode(',',
if ($bDiagnostics) {
if ($bVerbose) {
echo "The structure of the table $sTable for the data synchro task ".$this->GetName().' ('.$this->GetKey().') must be altered (missing or incorrect fields: '.implode(', ',
$aMissingFields).").\n";
}
}
@@ -1201,11 +1172,10 @@ EOF
// Repair the triggers
// Must be done after updating the columns because MySQL does check the validity of the query found into the procedure!
if ($bTriggerRebuildNeeded)
{
if ($bTriggerRebuildNeeded) {
// The triggers as well must be adjusted
$aTriggersDefs = $this->GetTriggersDefinition();
$aTriggerRepair = array();
$aTriggerRepair = [];
$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_bi`;";
$aTriggerRepair[] = $aTriggersDefs['bi'];
$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_bu`;";
@@ -1213,10 +1183,8 @@ EOF
$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_ad`;";
$aTriggerRepair[] = $aTriggersDefs['ad'];
if ($bDiagnostics)
{
if ($bVerbose)
{
if ($bDiagnostics) {
if ($bVerbose) {
echo "The triggers {$sTable}_bi, {$sTable}_bu, {$sTable}_ad for the data synchro task ".$this->GetName().' ('.$this->GetKey().") must be re-created.\n";
echo implode("\n", $aTriggerRepair)."\n";
}
@@ -1226,14 +1194,11 @@ EOF
// Execute the repair statements
//
if (!$bDiagnostics && (count($aRepairQueries) > 0))
{
if (!$bDiagnostics && (count($aRepairQueries) > 0)) {
// Fix the issue
foreach ($aRepairQueries as $sSQL)
{
foreach ($aRepairQueries as $sSQL) {
CMDBSource::Query($sSQL);
if ($bVerbose)
{
if ($bVerbose) {
echo "$sSQL\n";
}
}
@@ -1338,7 +1303,7 @@ EOF
if ($oAttDef->IsExternalKey())
{
// The pkey might be used as well as any other key column
$aColumns[$sAttCode] = 'VARCHAR(255)';
$aColumns[$sAttCode] = 'VARCHAR(255)'.CMDBSource::GetSqlStringColumnDefinition();
}
else
{