LIMIT separator

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

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 690e4f2dec6f01fbbee8a5e2f4c2100d2341b7a7..ef21ca4f217d1e42c25d9f3932d25b3a83b12b15 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -251,7 +251,7 @@ if (isset($_GET["mssql"])) {
                return get_vals("EXEC sp_databases");
        }
 
-       function limit($query, $limit, $offset = 0) {
+       function limit($query, $limit, $offset = 0, $separator = " ") {
                return (isset($limit) ? " TOP (" . ($limit + $offset) . ")" : "") . " $query"; // seek later
        }
 

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 3c1c2bf55b3feed5f5afe6039c90ef53454b1341..cf1dae32af97c5c537ae5d9dc94abc58785d5faf 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -260,10 +260,11 @@ if (!defined("DRIVER")) {
        * @param string everything after SELECT
        * @param int
        * @param int
+       * @param string
        * @return string
        */
-       function limit($query, $limit, $offset = 0) {
-               return " $query" . (isset($limit) ? "\nLIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+       function limit($query, $limit, $offset = 0, $separator = " ") {
+               return " $query" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
        }
 
        /** Formulate SQL modification query with limit 1

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 9ab53ea0a6533f6f294ca9b205364d27e48a29bb..4b6cc42961328656535b6cbd8573851953dc3ddc 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -163,8 +163,8 @@ if (isset($_GET["pgsql"])) {
                return get_vals("SELECT datname FROM pg_database");
        }
        
-       function limit($query, $limit, $offset = 0) {
-               return " $query" . (isset($limit) ? "\nLIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+       function limit($query, $limit, $offset = 0, $separator = " ") {
+               return " $query" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
        }
 
        function limit1($query) {

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index aa161c50cac54785bf51ac4c028b88971a49f2b0..6582120aa5ed471f53f2e35a1906cfc4085e270e 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -211,8 +211,8 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
                return array();
        }
 
-       function limit($query, $limit, $offset = 0) {
-               return " $query" . (isset($limit) ? "\nLIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+       function limit($query, $limit, $offset = 0, $separator = " ") {
+               return " $query" . (isset($limit) ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
        }
 
        function limit1($query) {

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 3c56bf062856c750f15ccc57ae1daf6e9267c972..bf8bab2a82dfb587aca4acf8b5c0477a33c7393c 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -197,7 +197,7 @@ if (!$columns) {
                $page = floor(($found_rows - 1) / $limit);
        }
 
-       $query = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $driver == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by, ($limit != "" ? intval($limit) : null), ($page ? $limit * $page : 0));
+       $query = "SELECT" . limit((intval($limit) && $group && count($group) < count($select) && $driver == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from . $group_by, ($limit != "" ? intval($limit) : null), ($page ? $limit * $page : 0), "\n");
        echo $adminer->selectQuery($query);
        
        $result = $connection->query($query);