Update setup/backup.class.inc.php

Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>

core/ormlinkset.class.inc.php

@@ -179,7 +179,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		assert($oLink instanceof $this->sClass);
 
 		$iObjectId = $oLink->GetKey();
-		if (array_key_exists($iObjectId, $this->aPreserved) && !$oLink->Equals(MetaModel::GetObject(get_class($oLink), $iObjectId, true))) {
+		if (array_key_exists($iObjectId, $this->aPreserved)) {
 			unset($this->aPreserved[$iObjectId]);
 			$this->aModified[$iObjectId] = $oLink;
 			$this->bHasDelta = true;

datamodels/2.x/itop-backup/status.php

@@ -96,7 +96,7 @@ try {
 	//
 	$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
 	$sMySQLBinDir = utils::ReadParam('mysql_bindir', $sMySQLBinDir, true);
-	$sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, 'mysqldump');
+	$sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, DBBackup::GetDumpFunction());
 	$sCommand = "$sMySQLDump -V 2>&1";
 
 	$aOutput = [];

setup/backup.class.inc.php

@@ -346,7 +346,7 @@ class DBBackup
 		$this->LogInfo("Starting backup of $this->sDBHost/$this->sDBName(suffix:'$this->sDBSubName')");
 		$sMySQLBinDir = utils::ReadParam('mysql_bindir', $this->sMySQLBinDir, true);
 
-		$sMySQLDump = $this->MakeSafeMySQLCommand($sMySQLBinDir, 'mysqldump');
+		$sMySQLDump = $this->MakeSafeMySQLCommand($sMySQLBinDir, DBBackup::GetDumpFunction());
 
 		// Store the results in a temporary file
 		$sTmpFileName = self::EscapeShellArg($sBackupFileName);
@@ -603,6 +603,16 @@ EOF;
 
 		return '"'.$sMySQLCommand.'"';
 	}
+
+	public static function GetDumpFunction(): string
+	{
+		$sVersion = CMDBSource::GetDBVersion();
+		if (stripos($sVersion, 'MariaDB') !== false) {
+			return 'mariadb-dump';
+		}
+
+		return 'mysqldump';
+	}
 }
 
 class TarGzArchive implements BackupArchive

setup/setuputils.class.inc.php

@@ -559,12 +559,15 @@ class SetupUtils
 			$aResult[] = new CheckResult(CheckResult::ERROR, "The PHP exec() function has been disabled on this server");
 		}
 
+		MetaModel::LoadConfig(utils::GetConfig());
 		// availability of mysqldump
 		if (empty($sMySQLBinDir) && null != MetaModel::GetConfig()) {
 			$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
 		}
 		try {
-			$sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, 'mysqldump');
+			$oConfig = MetaModel::GetConfig();
+			CMDBSource::InitFromConfig($oConfig);
+			$sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, DBBackup::GetDumpFunction());
 		} catch (Exception $e) {
 			$aResult[] = new CheckResult(CheckResult::ERROR, $e->getMessage());
 			return $aResult;