Print number of rows in SQL command

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@965 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 09b17815d0711a3554ecbcada1aeb4884465addc..5da3964850d19a9707086953b14fcb6c7a63cdd2 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -48,9 +48,13 @@ if (!$error && $_POST) {
                                                }
                                        } else {
                                                $end = explode(" ", microtime());
-                                               echo "<p class='time'>" . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "\n";
+                                               $i = 0;
                                                do {
                                                        $result = $dbh->store_result();
+                                                       if (!$i) {
+                                                               echo "<p class='time'>" . (is_object($result) ? lang('%d row(s)', $result->num_rows) . ", ": "") . lang('%.3f s', max(0, $end[0] - $start[0] + $end[1] - $start[1])) . "\n";
+                                                               $i++;
+                                                       }
                                                        if (is_object($result)) {
                                                                select($result, $dbh2);
                                                        } else {

diff --git a/changes.txt b/changes.txt
index 650a54a969e63a13666a6cc9f4161c6167352cea..6f53d515819ecea58396027fe602213ae028af0b 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -13,12 +13,13 @@ Show type in field name title (thanks to Jakub Sochor)
 Preselect now() for timestamp columns (thanks to paranoiq)
 Clear history (thanks to paranoiq)
 Prefill insert by foreign key searches
+Print number of rows in SQL command
 Remove Delete button from Edit page - use mass operation for it
 Faster multiple update, clone and delete
 Faster table list in navigation
 Download version checker and syntax highlighting from HTTPS
 Use HTML Strict instead of XHTML
-Remove function minification for performance and customization
+Remove function minification in favor of performance and customization
 Fix grant ALL PRIVILEGES with GRANT OPTION
 Fix CSV import
 Fix work with default values (thanks to Jiri Pospisil)