Use separator in limit1

diff --git a/adminer/drivers/firebird.inc.php b/adminer/drivers/firebird.inc.php
index 822b33b9a10d04de8951790871d3cb3ebfd47600..f08b08d30dda9588062a9136dbe5587dbc474788 100644 (file)
--- a/adminer/drivers/firebird.inc.php
+++ b/adminer/drivers/firebird.inc.php
@@ -147,8 +147,8 @@ if (isset($_GET["firebird"])) {
                return $return;
        }
 
-       function limit1($table, $query, $where) {
-               return limit($query, $where, 1);
+       function limit1($table, $query, $where, $separator = "\n") {
+               return limit($query, $where, 1, 0, $separator);
        }
 
        function db_collation($db, $collations) {

diff --git a/adminer/drivers/mssql.inc.php b/adminer/drivers/mssql.inc.php
index becfaeae0dd006d21c0f844341d59cf4f0e3e2cc..19f6669313db52d8f9f3c2ffc31f3e0e07a19ec2 100644 (file)
--- a/adminer/drivers/mssql.inc.php
+++ b/adminer/drivers/mssql.inc.php
@@ -308,8 +308,8 @@ if (isset($_GET["mssql"])) {
                return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
        }
 
-       function limit1($table, $query, $where) {
-               return limit($query, $where, 1);
+       function limit1($table, $query, $where, $separator = "\n") {
+               return limit($query, $where, 1, 0, $separator);
        }
 
        function db_collation($db, $collations) {

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 34a3b1d17de851bf99e9f4a1635489231bab4cd2..2f93e099025f6819b66c57fd50e92ca7ef73d7a3 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -365,10 +365,11 @@ if (!defined("DRIVER")) {
        * @param string
        * @param string everything after UPDATE or DELETE
        * @param string
+       * @param string
        * @return string
        */
-       function limit1($table, $query, $where) {
-               return limit($query, $where, 1);
+       function limit1($table, $query, $where, $separator = "\n") {
+               return limit($query, $where, 1, 0, $separator);
        }
 
        /** Get database collation

diff --git a/adminer/drivers/oracle.inc.php b/adminer/drivers/oracle.inc.php
index 3e7b997419a39e54121311fee2128499960ca617..060b8c5965738614a8af9d69f191ab401117bb37 100644 (file)
--- a/adminer/drivers/oracle.inc.php
+++ b/adminer/drivers/oracle.inc.php
@@ -175,7 +175,7 @@ if (isset($_GET["oracle"])) {
                ));
        }
 
-       function limit1($table, $query, $where) {
+       function limit1($table, $query, $where, $separator = "\n") {
                return " $query$where"; //! limit
        }
 

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 5e7b5c64abdf33251ef997c9cd333f84c9b674d7..7eb5e90341943f6777849d5234fb21ae8addaeb0 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -226,10 +226,10 @@ if (isset($_GET["pgsql"])) {
                return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
        }
 
-       function limit1($table, $query, $where) {
+       function limit1($table, $query, $where, $separator = "\n") {
                return (preg_match('~^INTO~', $query)
-                       ? limit($query, $where, 1)
-                       : " $query WHERE ctid = (SELECT ctid FROM " . table($table) . "$where LIMIT 1)"
+                       ? limit($query, $where, 1, 0, $separator)
+                       : " $query WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)"
                );
        }
 

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 454ca9bdc48dec047364fcdfbb8ecf3f81fa5e61..4809c31dd8835b359931468696d381d90a2a9a5f 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -242,11 +242,11 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
                return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
        }
 
-       function limit1($table, $query, $where) {
+       function limit1($table, $query, $where, $separator = "\n") {
                global $connection;
                return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
-                       ? limit($query, $where, 1)
-                       : " $query WHERE rowid = (SELECT rowid FROM " . table($table) . "$where LIMIT 1)"
+                       ? limit($query, $where, 1, 0, $separator)
+                       : " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)"
                );
        }
 

diff --git a/adminer/include/driver.inc.php b/adminer/include/driver.inc.php
index 5db00dcb0ee13b15e8deb678eb9652e3b1442850..69e1aa492094b00b2c79b3c5c2d46798bfe0d2eb 100644 (file)
--- a/adminer/include/driver.inc.php
+++ b/adminer/include/driver.inc.php
@@ -67,7 +67,7 @@
                        $values[] = "$key = $val";
                }
                $query = table($table) . " SET$separator" . implode(",$separator", $values);
-               return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere) : " $query$queryWhere"));
+               return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere, $separator) : " $query$queryWhere"));
        }
        
        /** Insert data into table