Qual: Dplacement des drivers de base de donnes de /lib dans /lib/databases pour plus de clart.
New: Ajout du driver mysqli pour accder mysql via les fonction mysqli de la 4.1
This commit is contained in:
Laurent Destailleur
parent
9294334913
commit
28dd607f90
@ -43,66 +43,73 @@ llxHeader();
|
||||
|
||||
print_titre($langs->trans("Constraints"));
|
||||
|
||||
if ($conf->db->type == 'mysql')
|
||||
$base=0;
|
||||
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
|
||||
{
|
||||
$sql = "SHOW TABLE STATUS";
|
||||
$base=1;
|
||||
}
|
||||
|
||||
if ($conf->db->type == 'pgsql')
|
||||
{
|
||||
$sql = "SELECT conname, contype FROM pg_constraint;";
|
||||
$base=2;
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
|
||||
if($base==1)
|
||||
if (! $base)
|
||||
{
|
||||
print '<td>'.$langs->trans("Tables").'</td>';
|
||||
print '<td>'.$langs->trans("Type").'</td>';
|
||||
print '<td>'.$langs->trans("Constraints").'</td>';
|
||||
print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<td>'.$langs->trans("Constraints").'</td>';
|
||||
print '<td>'.$langs->trans("ConstraintsType").'</td>';
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
|
||||
if ($base==1)
|
||||
{
|
||||
print '<td>'.$langs->trans("Tables").'</td>';
|
||||
print '<td>'.$langs->trans("Type").'</td>';
|
||||
print '<td>'.$langs->trans("Constraints").'</td>';
|
||||
}
|
||||
if ($base==2)
|
||||
{
|
||||
print '<td>'.$langs->trans("Constraints").'</td>';
|
||||
print '<td>'.$langs->trans("ConstraintsType").'</td>';
|
||||
}
|
||||
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows($result);
|
||||
$var=True;
|
||||
$i=0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$obj = $db->fetch_object($rsult);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
|
||||
if ($base==1)
|
||||
{
|
||||
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
|
||||
print '<td>'.$obj->Engine.'</td>';
|
||||
print '<td>'.$obj->Comment.'</td>';
|
||||
}
|
||||
if ($base==2)
|
||||
{
|
||||
print '<td>'.$obj->conname.'</td>';
|
||||
print '<td>'.$obj->contype.'</td>';
|
||||
}
|
||||
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
}
|
||||
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows($result);
|
||||
$var=True;
|
||||
$i=0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$obj = $db->fetch_object($rsult);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
|
||||
if ($base==1)
|
||||
{
|
||||
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
|
||||
print '<td>'.$obj->Engine.'</td>';
|
||||
print '<td>'.$obj->Comment.'</td>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<td>'.$obj->conname.'</td>';
|
||||
print '<td>'.$obj->contype.'</td>';
|
||||
}
|
||||
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
@ -48,101 +48,120 @@ llxHeader();
|
||||
|
||||
print_titre($langs->trans("Tables")." ".ucfirst($conf->db->type));
|
||||
|
||||
if($conf->db->type == 'mysql')
|
||||
$base=0;
|
||||
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
|
||||
{
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("TableName").'</td>';
|
||||
print '<td colspan="2">'.$langs->trans("Type").'</td>';
|
||||
print '<td>'.$langs->trans("Format").'</td>';
|
||||
print '<td>'.$langs->trans("NbOfRecord").'</td>';
|
||||
print '<td>Avg_row_length</td>';
|
||||
print '<td>Data_length</td>';
|
||||
print '<td>Max_Data_length</td>';
|
||||
print '<td>Index_length</td>';
|
||||
print '<td>Increment</td>';
|
||||
print '<td>Last check</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
$sql = "SHOW TABLE STATUS";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows($result);
|
||||
$var=True;
|
||||
$i=0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$obj = $db->fetch_object($result);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
|
||||
print '<td>'.$obj->Name.'</td>';
|
||||
print '<td>'.$obj->Engine.'</td>';
|
||||
if ($row[1] == "MyISAM")
|
||||
{
|
||||
print '<td><a href="database-tables.php?action=convert&table='.$row[0].'">'.$langs->trans("Convert").'</a></td>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<td> </td>';
|
||||
}
|
||||
print '<td>'.$obj->Row_format.'</td>';
|
||||
print '<td align="right">'.$obj->Rows.'</td>';
|
||||
print '<td align="right">'.$obj->Avg_row_length.'</td>';
|
||||
print '<td align="right">'.$obj->Data_length.'</td>';
|
||||
print '<td align="right">'.$obj->Max_data_length.'</td>';
|
||||
print '<td align="right">'.$obj->Index_length.'</td>';
|
||||
print '<td align="right">'.$obj->Auto_increment.'</td>';
|
||||
print '<td align="right">'.$obj->Check_time.'</td>';
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
$base=1;
|
||||
}
|
||||
|
||||
if($conf->db->type == 'pgsql')
|
||||
if ($conf->db->type == 'pgsql')
|
||||
{
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("TableName").'</td>';
|
||||
print '<td>Nombre de tuples lu</td>';
|
||||
print '<td>Nb index fetcher.</td>';
|
||||
print '<td>Nbre de tuples inserer</td>';
|
||||
print '<td>Nbre de tuple modifier</td>';
|
||||
print '<td>Nbre de tuple supprimer</td>';
|
||||
print "</tr>\n";
|
||||
$sql = "select relname,seq_tup_read,idx_tup_fetch,n_tup_ins,n_tup_upd,n_tup_del from pg_stat_user_tables;";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
$var=True;
|
||||
$i=0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$row = $db->fetch_row($i);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
print '<td align="right">'.$row[0].'</td>';
|
||||
print '<td align="right">'.$row[1].'</td>';
|
||||
print '<td align="right">'.$row[2].'</td>';
|
||||
print '<td align="right">'.$row[3].'</td>';
|
||||
print '<td align="right">'.$row[4].'</td>';
|
||||
print '<td align="right">'.$row[5].'</td>';
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
$sql = "SELECT conname, contype FROM pg_constraint;";
|
||||
$base=2;
|
||||
}
|
||||
|
||||
|
||||
if (! $base)
|
||||
{
|
||||
print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($base == 1)
|
||||
{
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("TableName").'</td>';
|
||||
print '<td colspan="2">'.$langs->trans("Type").'</td>';
|
||||
print '<td>'.$langs->trans("Format").'</td>';
|
||||
print '<td>'.$langs->trans("NbOfRecord").'</td>';
|
||||
print '<td>Avg_row_length</td>';
|
||||
print '<td>Data_length</td>';
|
||||
print '<td>Max_Data_length</td>';
|
||||
print '<td>Index_length</td>';
|
||||
print '<td>Increment</td>';
|
||||
print '<td>Last check</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
$sql = "SHOW TABLE STATUS";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows($result);
|
||||
$var=True;
|
||||
$i=0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$obj = $db->fetch_object($result);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
|
||||
print '<td>'.$obj->Name.'</td>';
|
||||
print '<td>'.$obj->Engine.'</td>';
|
||||
if ($row[1] == "MyISAM")
|
||||
{
|
||||
print '<td><a href="database-tables.php?action=convert&table='.$row[0].'">'.$langs->trans("Convert").'</a></td>';
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<td> </td>';
|
||||
}
|
||||
print '<td>'.$obj->Row_format.'</td>';
|
||||
print '<td align="right">'.$obj->Rows.'</td>';
|
||||
print '<td align="right">'.$obj->Avg_row_length.'</td>';
|
||||
print '<td align="right">'.$obj->Data_length.'</td>';
|
||||
print '<td align="right">'.$obj->Max_data_length.'</td>';
|
||||
print '<td align="right">'.$obj->Index_length.'</td>';
|
||||
print '<td align="right">'.$obj->Auto_increment.'</td>';
|
||||
print '<td align="right">'.$obj->Check_time.'</td>';
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
}
|
||||
|
||||
if ($base == 2)
|
||||
{
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("TableName").'</td>';
|
||||
print '<td>Nombre de tuples lu</td>';
|
||||
print '<td>Nb index fetcher.</td>';
|
||||
print '<td>Nbre de tuples inserer</td>';
|
||||
print '<td>Nbre de tuple modifier</td>';
|
||||
print '<td>Nbre de tuple supprimer</td>';
|
||||
print "</tr>\n";
|
||||
$sql = "select relname,seq_tup_read,idx_tup_fetch,n_tup_ins,n_tup_upd,n_tup_del from pg_stat_user_tables;";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$num = $db->num_rows();
|
||||
$var=True;
|
||||
$i=0;
|
||||
while ($i < $num)
|
||||
{
|
||||
$row = $db->fetch_row($i);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
print '<td align="right">'.$row[0].'</td>';
|
||||
print '<td align="right">'.$row[1].'</td>';
|
||||
print '<td align="right">'.$row[2].'</td>';
|
||||
print '<td align="right">'.$row[3].'</td>';
|
||||
print '<td align="right">'.$row[4].'</td>';
|
||||
print '<td align="right">'.$row[5].'</td>';
|
||||
print '</tr>';
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
}
|
||||
}
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
|
||||
?>
|
||||
|
||||
@ -22,7 +22,8 @@
|
||||
* $Source$
|
||||
*/
|
||||
|
||||
/*! \file htdocs/admin/system/database.php
|
||||
/**
|
||||
\file htdocs/admin/system/database.php
|
||||
\brief Page des infos système de la base de donnée
|
||||
\version $Revision$
|
||||
*/
|
||||
@ -34,52 +35,58 @@ $langs->load("admin");
|
||||
|
||||
if (!$user->admin)
|
||||
accessforbidden();
|
||||
|
||||
|
||||
|
||||
|
||||
llxHeader();
|
||||
|
||||
print_titre($langs->trans("DatabaseConfiguration"));
|
||||
|
||||
if ($conf->db->type == 'mysql')
|
||||
$base=0;
|
||||
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
|
||||
{
|
||||
$sql = "SHOW VARIABLES";
|
||||
$base=1;
|
||||
}
|
||||
|
||||
if ($conf->db->type == 'pgsql')
|
||||
{
|
||||
$sql = "select name,setting from pg_settings;";
|
||||
$base=2;
|
||||
}
|
||||
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Parameter").'</td>';
|
||||
print '<td>'.$langs->trans("Value").'</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
if (! $base)
|
||||
{
|
||||
$i=0;
|
||||
$num = $db->num_rows();
|
||||
$var=True;
|
||||
while ($i < $num)
|
||||
{
|
||||
$objp = $db->fetch_object($result);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
if ($base==1)
|
||||
print '<td>'.$objp->Variable_name.'</td><td>'.$objp->Value.'</td>';
|
||||
else
|
||||
print '<td>'.$objp->name.'</td><td>'.$objp->setting.'</td>';
|
||||
print '</tr>';
|
||||
|
||||
$i++;
|
||||
}
|
||||
print $langs->trans("FeatureNotAvailableWithThisDatabaseDriver");
|
||||
}
|
||||
else
|
||||
{
|
||||
print '<br>';
|
||||
print '<table class="noborder">';
|
||||
print '<tr class="liste_titre">';
|
||||
print '<td>'.$langs->trans("Parameter").'</td>';
|
||||
print '<td>'.$langs->trans("Value").'</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
$result = $db->query($sql);
|
||||
if ($result)
|
||||
{
|
||||
$i=0;
|
||||
$num = $db->num_rows();
|
||||
$var=True;
|
||||
while ($i < $num)
|
||||
{
|
||||
$objp = $db->fetch_object($result);
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]>";
|
||||
if ($base==1) print '<td>'.$objp->Variable_name.'</td><td>'.$objp->Value.'</td>';
|
||||
if ($base==2) print '<td>'.$objp->name.'</td><td>'.$objp->setting.'</td>';
|
||||
print '</tr>';
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
print '</table>';
|
||||
}
|
||||
print '</table>';
|
||||
|
||||
llxFooter();
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user