Permalink
Browse files

Print sums in tables overview

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1299 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information...
jakubvrana
jakubvrana committed Jan 28, 2010
1 parent ce49880 commit 4df6accd7b94a9ad56dcaf6b7bd8c1fded802582
Showing with 12 additions and 1 deletion.
  1. +9 −1 adminer/db.inc.php
  2. +1 −0 adminer/lang/cs.inc.php
  3. +1 −0 changes.txt
  4. +1 −0 todo.txt
View
@@ -48,7 +48,8 @@
} else {
echo "<form action='' method='post'>\n";
echo "<table cellspacing='0' class='nowrap' onclick='tableClick(event);'>\n";
- echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^(tables|views)\[/);" title="' . count($table_status) . '"><th>' . lang('Table') . '<td>' . lang('Engine') . '<td>' . lang('Collation') . '<td>' . lang('Data Length') . '<td>' . lang('Index Length') . '<td>' . lang('Data Free') . '<td>' . lang('Auto Increment') . '<td>' . lang('Rows') . '<td>' . lang('Comment') . "</thead>\n";
+ echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^(tables|views)\[/);"><th>' . lang('Table') . '<td>' . lang('Engine') . '<td>' . lang('Collation') . '<td>' . lang('Data Length') . '<td>' . lang('Index Length') . '<td>' . lang('Data Free') . '<td>' . lang('Auto Increment') . '<td>' . lang('Rows') . '<td>' . lang('Comment') . "</thead>\n";
+ $sums = array();
foreach ($table_status as $row) {
$name = $row["Name"];
echo '<tr' . odd() . '><td>' . checkbox((isset($row["Rows"]) ? "tables[]" : "views[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
@@ -58,6 +59,7 @@
foreach (array("Data_length" => "create", "Index_length" => "indexes", "Data_free" => "edit", "Auto_increment" => "create", "Rows" => "select") as $key => $link) {
$val = number_format($row[$key], 0, '.', lang(','));
echo '<td align="right">' . ($row[$key] != "" ? '<a href="' . h(ME . "$link=") . urlencode($name) . '">' . str_replace(" ", "&nbsp;", ($key == "Rows" && $row["Engine"] == "InnoDB" && $val ? lang('~ %s', $val) : $val)) . '</a>' : '&nbsp;');
+ $sums[$link] += ($row["Engine"] != "InnoDB" || $link != "edit" ? $row[$key] : 0);
}
echo "<td>" . nbsp($row["Comment"]);
} else {
@@ -66,6 +68,12 @@
echo '<td>&nbsp;';
}
}
+ echo "<tr><td>&nbsp;<th>" . lang('%d in total', count($table_status));
+ echo "<td>" . $connection->result($connection->query("SELECT @@storage_engine"));
+ echo "<td>" . db_collation(DB, collations());
+ foreach (array("create", "indexes", "edit") as $val) {
+ echo "<td align='right'>" . number_format($sums[$val], 0, '.', lang(','));
+ }
echo "</table>\n";
echo "<p><input type='hidden' name='token' value='$token'><input type='submit' value='" . lang('Analyze') . "'> <input type='submit' name='optimize' value='" . lang('Optimize') . "'> <input type='submit' name='check' value='" . lang('Check') . "'> <input type='submit' name='repair' value='" . lang('Repair') . "'> <input type='submit' name='truncate' value='" . lang('Truncate') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /tables/) + ')');\"> <input type='submit' name='drop' value='" . lang('Drop') . "' onclick=\"return confirm('" . lang('Are you sure?') . " (' + formChecked(this, /tables|views/) + ')');\">\n";
$dbs = get_databases();
View
@@ -227,4 +227,5 @@
'Webserver file %s' => 'Soubor %s na webovém serveru',
'File does not exist.' => 'Soubor neexistuje.',
'Permanent login' => 'Trvalé přihlášení',
+ '%d in total' => '%d celkem',
);
View
@@ -1,6 +1,7 @@
Adminer 2.3.0-dev:
Support for permanent login (customization required)
Show status variables
+Print sums in tables overview
Add Delete button to Edit page (regression from 2.0.0)
Simplify SQL syntax error message
Show SQL query info if available
View
@@ -8,6 +8,7 @@ Offer enum and set items in search - whisperer
Variables editation, especially timezone
Use event $intervals + microseconds in relative date functions
Optionally check IP address
+Disable spell checking in SQL textareas - spellcheck="false"
? Column and table names auto-completition in SQL textarea
? Aliasing of built-in functions can save 7 KB, function minification can save 7 KB, substitution of repetitive $a["a"] can save 4 KB, substitution of $_GET and friends can save 2 KB, JS packer can save 1 KB, not enclosing HTML attribute values can save 1.2 KB, replacing \\n by \n can save .3 KB
? Branch binary_compile: LZW compression of translations can save 30 KB, LZW compression of all texts can save 11 KB, remove of base64_decode() + using chars 127-255 in minification can save 1 KB

0 comments on commit 4df6acc

Please sign in to comment.