Elastic: Use select() instead of SELECT

diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index 29a792a2a49b655ec7280c994edd89d4a8c1abe8..6a12a785416f1b2b8bfd102df50e10e207460c75 100644 (file)
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -89,8 +89,11 @@ if ($_POST["save"]) {
                $select = array("*");
        }
        if ($select) {
-               $rows = get_rows("SELECT" . limit(implode(", ", $select) . " FROM " . table($TABLE), " WHERE $where", (isset($_GET["select"]) ? 2 : 1)));
-               $row = (isset($_GET["select"]) && count($rows) != 1 ? null : reset($rows));
+               $result = $driver->select($TABLE, $select, array($where), $select, array(), (isset($_GET["select"]) ? 2 : 1), 0);
+               $row = $result->fetch_assoc();
+               if (isset($_GET["select"]) && (!$row || $result->fetch_assoc())) { // $result->num_rows != 1 isn't available in all drivers
+                       $row = null;
+               }
        }
 }
 

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 88d0998ac3e3fecae51b5c630d8af9c0a497673c..b6dcd32555475b3e3bd05a27d866ab8f7d6b92da 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -169,10 +169,10 @@ username.form['auth[driver]'].onchange();
        */
        function selectQuery($query) {
                global $jush;
-               return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code>"
+               return ($_GET["edit"] != "" ? "" : "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code>"
                        . (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
                        . "</p>" // </p> - required for IE9 inline edit
-               ;
+               );
        }
 
        /** Description of a row in a table