From e8b95f127fbd5166ee5618910676afec36c6f7b3 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 29 Jul 2012 10:45:38 -0700
Subject: [PATCH] SQLite: Display number of rows in database overview

---
 adminer/drivers/sqlite.inc.php | 2 ++
 adminer/script.inc.php         | 8 ++++----
 changes.txt                    | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 9693e324..994d220b 100644
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -250,10 +250,12 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	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) {
diff --git a/adminer/script.inc.php b/adminer/script.inc.php
index 7a20ba07..39ede5bf 100644
--- a/adminer/script.inc.php
+++ b/adminer/script.inc.php
@@ -13,10 +13,10 @@ if ($_GET["script"] == "db") {
 			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);
diff --git a/changes.txt b/changes.txt
index 94265583..88618c8c 100644
--- a/changes.txt
+++ b/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