Wrap SQL query

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

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index d853253c41d24649edab2c6bdee11fec604680b2..17ed3d3187ec8a0dd1874557eeaeb4c3e7e24b00 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -126,7 +126,7 @@ class Adminer {
        * @return string
        */
        function selectQuery($query) {
-               return "<p><code class='jush-sql'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
+               return "<p><code class='jush-sql'>" . h(str_replace("\n", " ", $query)) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
        }
        
        /** Description of a row in a table

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 920b1fc2cda8ca1c1e4cc2f0430ec2007dfc3922..f6c1d316447f96244441d2761e4b50b4f47e4c42 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -23,8 +23,8 @@ list($select, $group) = $adminer->selectColumnsProcess($columns, $indexes);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
 $limit = $adminer->selectLimitProcess();
-$from = ($select ? implode(", ", $select) : "*") . " FROM " . idf_escape($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : "");
-$group_by = ($group && count($group) < count($select) ? " GROUP BY " . implode(", ", $group) : "") . ($order ? " ORDER BY " . implode(", ", $order) : "");
+$from = ($select ? implode(", ", $select) : "*") . "\nFROM " . idf_escape($TABLE) . ($where ? "\nWHERE " . implode(" AND ", $where) : "");
+$group_by = ($group && count($group) < count($select) ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
 
 if ($_POST && !$error) {
        $where_check = "(" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . ")";
@@ -163,7 +163,7 @@ if (!$columns) {
        $adminer->selectActionPrint($text_length);
        echo "</form>\n";
        
-       $query = "SELECT " . (intval($limit) && $group && count($group) < count($select) ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by . ($limit != "" ? " LIMIT " . intval($limit) . ($_GET["page"] ? " OFFSET " . ($limit * $_GET["page"]) : "") : "");
+       $query = "SELECT " . (intval($limit) && $group && count($group) < count($select) ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by . ($limit != "" ? "\nLIMIT " . intval($limit) . ($_GET["page"] ? " OFFSET " . ($limit * $_GET["page"]) : "") : "");
        echo $adminer->selectQuery($query);
        
        $result = $connection->query($query);

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 568c2fb5e90371ee0a10a59b71e74a08aa6d1be9..798729306be1e26b501763e737df16cc66fd6ed7 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -105,7 +105,7 @@ ORDER BY ORDINAL_POSITION");
        }
        
        function selectQuery($query) {
-               return "<!-- " . str_replace("--", "--><!--", $query) . " -->\n";
+               return "<!--\n" . str_replace("--", "--><!--", $query) . "\n-->\n";
        }
        
        function rowDescription($table) {