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

Fix: Corrige pb sur passage script migration si contient des requetes vides (lignes de blanc)

Browse Source
This commit is contained in:
Laurent Destailleur 2006-02-26 15:31:11 +00:00
parent 0c1e1e1a8c
commit 0ce24b707b
1 changed files with 221 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
htdocs/install/upgrade.php
View File

@ -147,49 +147,52 @@ if (isset($_GET["action"]) && $_GET["action"] == "upgrade")
if (eregi(';',$buffer)) if (eregi(';',$buffer))
{ {
// Found new request // Found new request
$arraysql[$i]=$buffer; $arraysql[$i]=trim($buffer);
$i++; $i++;
$buffer=''; $buffer='';
} }
} }
if ($buffer) $arraysql[$i]=$buffer; if ($buffer) $arraysql[$i]=trim($buffer);
fclose($fp); fclose($fp);
} }
// Loop on each request // Loop on each request
foreach($arraysql as $i=>$sql) foreach($arraysql as $i=>$sql)
{ {
// print '<tr><td>'.$langs->trans("Request").' '.$i.'</td>'; if ($sql)
{
// print '<tr><td>'.$langs->trans("Request").' '.$i.'</td>';
print("Execution de requete=".($i+1)." sql='".$sql."'<br>\n");
if ($db->query($sql))
{
// print '<td align="right">OK</td>';
}
else
{
$errno=$db->errno();
$okerror=array( 'DB_ERROR_TABLE_ALREADY_EXISTS',
'DB_ERROR_COLUMN_ALREADY_EXISTS',
'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
'DB_ERROR_RECORD_ALREADY_EXISTS',
'DB_ERROR_NOSUCHTABLE',
'DB_ERROR_NOSUCHFIELD',
'DB_ERROR_CANNOT_CREATE' // Qd contrainte deja existante
);
if (in_array($errno,$okerror))
{
// print '<td align="right">'.$langs->trans("OK").'</td>';
}
else
{
print '<tr><td valign="top">'.$langs->trans("Request").' '.($i+1).'</td>';
print '<td valign="top">'.$langs->trans("Error")." ".$db->errno()." ".$sql."<br>".$db->error()."</td>";
print '</tr>';
$error++;
}
}
if ($db->query($sql)) // print '</tr>';
{ }
// print '<td align="right">OK</td>';
}
else
{
$errno=$db->errno();
$okerror=array( 'DB_ERROR_TABLE_ALREADY_EXISTS',
'DB_ERROR_COLUMN_ALREADY_EXISTS',
'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
'DB_ERROR_RECORD_ALREADY_EXISTS',
'DB_ERROR_NOSUCHTABLE',
'DB_ERROR_NOSUCHFIELD',
'DB_ERROR_CANNOT_CREATE' // Qd contrainte deja existante
);
if (in_array($errno,$okerror))
{
// print '<td align="right">'.$langs->trans("OK").'</td>';
}
else
{
print '<tr><td valign="top">'.$langs->trans("Request").' '.$i.'</td>';
print '<td valign="top">'.$langs->trans("Error")." ".$db->errno()." ".$sql."<br>".$db->error()."</td>";
print '</tr>';
$error++;
}
}
// print '</tr>';
} }
} }