From 99a643b86e98c81dfcdfa35bddf746431dfd7212 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Mon, 26 Apr 2010 16:19:26 +0000
Subject: [PATCH] LIMIT separator

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1494 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/drivers/mssql.inc.php  | 2 +-
 adminer/drivers/mysql.inc.php  | 5 +++--
 adminer/drivers/pgsql.inc.php  | 4 ++--
 adminer/drivers/sqlite.inc.php | 4 ++--
 adminer/select.inc.php         | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index 690e4f2d..ef21ca4f 100644
--- 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 3c1c2bf5..cf1dae32 100644
--- 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 9ab53ea0..4b6cc429 100644
--- 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 aa161c50..6582120a 100644
--- 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 3c56bf06..bf8bab2a 100644
--- 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);