lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.3' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-01-16 14:21:56 +01:00
commit d40440fc45
1 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
htdocs/install/upgrade.php
View File

@ -181,73 +181,76 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
if ($ok) if ($ok)
{ {
$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association"); $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
$obj = $db->fetch_object($result); if ($result) // result defined for version 3.2 or -
if ($obj) // It table categorie_association exists
{ {
$couples=array(); $obj = $db->fetch_object($result);
$filles=array(); if ($obj) // It table categorie_association exists
$sql = "SELECT fk_categorie_mere, fk_categorie_fille";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
dolibarr_install_syslog("upgrade: search duplicate sql=".$sql);
$resql = $db->query($sql);
if ($resql)
{ {
$num=$db->num_rows($resql); $couples=array();
while ($obj=$db->fetch_object($resql)) $filles=array();
{ $sql = "SELECT fk_categorie_mere, fk_categorie_fille";
if (! isset($filles[$obj->fk_categorie_fille])) // Only one record as child (a child has only on parent). $sql.= " FROM ".MAIN_DB_PREFIX."categorie_association";
{ dolibarr_install_syslog("upgrade: search duplicate sql=".$sql);
if ($obj->fk_categorie_mere != $obj->fk_categorie_fille) $resql = $db->query($sql);
{ if ($resql)
$filles[$obj->fk_categorie_fille]=1; // Set record for this child {
$couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille]=array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille); $num=$db->num_rows($resql);
} while ($obj=$db->fetch_object($resql))
} {
} if (! isset($filles[$obj->fk_categorie_fille])) // Only one record as child (a child has only on parent).
{
if ($obj->fk_categorie_mere != $obj->fk_categorie_fille)
{
$filles[$obj->fk_categorie_fille]=1; // Set record for this child
$couples[$obj->fk_categorie_mere.'_'.$obj->fk_categorie_fille]=array('mere'=>$obj->fk_categorie_mere, 'fille'=>$obj->fk_categorie_fille);
}
}
}
dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples)); dolibarr_install_syslog("upgrade: result is num=".$num." count(couples)=".count($couples));
// If there is duplicates couples or child with two parents // If there is duplicates couples or child with two parents
if (count($couples) > 0 && $num > count($couples)) if (count($couples) > 0 && $num > count($couples))
{ {
$error=0; $error=0;
$db->begin(); $db->begin();
// We delete all // We delete all
$sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association"; $sql="DELETE FROM ".MAIN_DB_PREFIX."categorie_association";
dolibarr_install_syslog("upgrade: delete association sql=".$sql); dolibarr_install_syslog("upgrade: delete association sql=".$sql);
$resqld=$db->query($sql); $resqld=$db->query($sql);
if ($resqld) if ($resqld)
{ {
// And we insert only each record once // And we insert only each record once
foreach($couples as $key => $val) foreach($couples as $key => $val)
{ {
$sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)"; $sql ="INSERT INTO ".MAIN_DB_PREFIX."categorie_association(fk_categorie_mere,fk_categorie_fille)";
$sql.=" VALUES(".$val['mere'].", ".$val['fille'].")"; $sql.=" VALUES(".$val['mere'].", ".$val['fille'].")";
dolibarr_install_syslog("upgrade: insert association sql=".$sql); dolibarr_install_syslog("upgrade: insert association sql=".$sql);
$resqli=$db->query($sql); $resqli=$db->query($sql);
if (! $resqli) $error++; if (! $resqli) $error++;
} }
} }
if (! $error) if (! $error)
{ {
print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>'; print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>';
print '<td align="right">'.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>'; print '<td align="right">'.$langs->trans("Success").' ('.$num.'=>'.count($couples).')</td></tr>';
$db->commit(); $db->commit();
} }
else else
{ {
print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>'; print '<tr><td>'.$langs->trans("RemoveDuplicates").'</td>';
print '<td align="right">'.$langs->trans("Failed").'</td></tr>'; print '<td align="right">'.$langs->trans("Failed").'</td></tr>';
$db->rollback(); $db->rollback();
} }
} }
} }
else else
{ {
print '<div class="error">'.$langs->trans("Error").' '.$db->lasterror().'</div>'; print '<div class="error">'.$langs->trans("Error").' '.$db->lasterror().'</div>';
}
} }
} }
} }