Use separator in limit1
This commit is contained in:
parent
0866c79afb
commit
685bf29abc
|
@ -147,8 +147,8 @@ if (isset($_GET["firebird"])) {
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function limit1($table, $query, $where) {
|
function limit1($table, $query, $where, $separator = "\n") {
|
||||||
return limit($query, $where, 1);
|
return limit($query, $where, 1, 0, $separator);
|
||||||
}
|
}
|
||||||
|
|
||||||
function db_collation($db, $collations) {
|
function db_collation($db, $collations) {
|
||||||
|
|
|
@ -308,8 +308,8 @@ if (isset($_GET["mssql"])) {
|
||||||
return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
|
return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
|
||||||
}
|
}
|
||||||
|
|
||||||
function limit1($table, $query, $where) {
|
function limit1($table, $query, $where, $separator = "\n") {
|
||||||
return limit($query, $where, 1);
|
return limit($query, $where, 1, 0, $separator);
|
||||||
}
|
}
|
||||||
|
|
||||||
function db_collation($db, $collations) {
|
function db_collation($db, $collations) {
|
||||||
|
|
|
@ -365,10 +365,11 @@ if (!defined("DRIVER")) {
|
||||||
* @param string
|
* @param string
|
||||||
* @param string everything after UPDATE or DELETE
|
* @param string everything after UPDATE or DELETE
|
||||||
* @param string
|
* @param string
|
||||||
|
* @param string
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function limit1($table, $query, $where) {
|
function limit1($table, $query, $where, $separator = "\n") {
|
||||||
return limit($query, $where, 1);
|
return limit($query, $where, 1, 0, $separator);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get database collation
|
/** Get database collation
|
||||||
|
|
|
@ -175,7 +175,7 @@ if (isset($_GET["oracle"])) {
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
function limit1($table, $query, $where) {
|
function limit1($table, $query, $where, $separator = "\n") {
|
||||||
return " $query$where"; //! limit
|
return " $query$where"; //! limit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -226,10 +226,10 @@ if (isset($_GET["pgsql"])) {
|
||||||
return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
|
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)
|
return (preg_match('~^INTO~', $query)
|
||||||
? limit($query, $where, 1)
|
? limit($query, $where, 1, 0, $separator)
|
||||||
: " $query WHERE ctid = (SELECT ctid FROM " . table($table) . "$where LIMIT 1)"
|
: " $query WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -242,11 +242,11 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
|
||||||
return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
|
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;
|
global $connection;
|
||||||
return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
|
return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
|
||||||
? limit($query, $where, 1)
|
? limit($query, $where, 1, 0, $separator)
|
||||||
: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . "$where LIMIT 1)"
|
: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
$values[] = "$key = $val";
|
$values[] = "$key = $val";
|
||||||
}
|
}
|
||||||
$query = table($table) . " SET$separator" . implode(",$separator", $values);
|
$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
|
/** Insert data into table
|
||||||
|
|
Loading…
Reference in a new issue