Permalink
Browse files

SQLite: Display number of rows in database overview

  • Loading branch information...
1 parent f1153aa commit e8b95f127fbd5166ee5618910676afec36c6f7b3 @vrana committed Jul 29, 2012
Showing with 8 additions and 5 deletions.
  1. +2 −0 adminer/drivers/sqlite.inc.php
  2. +4 −4 adminer/script.inc.php
  3. +2 −1 changes.txt
View
2 adminer/drivers/sqlite.inc.php
@@ -250,10 +250,12 @@ function count_tables($databases) {
}
function table_status($name = "") {
+ global $connection;
$return = array();
foreach (get_rows("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view')" . ($name != "" ? " AND name = " . q($name) : "")) as $row) {
$row["Oid"] = "t";
$row["Auto_increment"] = "";
+ $row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
$return[$row["Name"]] = $row;
}
foreach (get_rows("SELECT * FROM sqlite_sequence", null, "") as $row) {
View
8 adminer/script.inc.php
@@ -13,10 +13,10 @@
foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
if ($table_status[$key] != "") {
$val = number_format($table_status[$key], 0, '.', lang(','));
- json_row("$key-$id", ($key == "Rows" && $val && (
- $table_status["Engine"] == "InnoDB" || // MySQL InnoDB
- $table_status["Engine"] == "table" // PostgreSQL table reltype
- ) ? "~ $val" : $val));
+ json_row("$key-$id", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
+ ? "~ $val"
+ : $val
+ ));
if (isset($sums[$key])) {
// ignore innodb_file_per_table because it is not active for tables created before it was enabled
$sums[$key] += ($table_status["Engine"] != "InnoDB" || $key != "Data_free" ? $table_status[$key] : 0);
View
3 changes.txt
@@ -1,7 +1,8 @@
Adminer 3.4.1-dev:
Display assigned auto_increment after clone
SQLite: Full alter table
-SQLite: Better editing in tables without a primary key
+SQLite: Better editing in tables without primary key
+SQLite: Display number of rows in database overview
Adminer 3.4.0 (released 2012-06-30):
Link to descending order

0 comments on commit e8b95f1

Please sign in to comment.