mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-07 15:16:44 +02:00
Code Issues Releases Wiki Activity

Notices: Add helper for reset() with expression

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-23 21:38:36 +01:00
parent 0501846743
commit f5ecb18896
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/drivers/pgsql.inc.php
View File

@@ -876,7 +876,7 @@ AND typelem = 0"
// sequences for fields // sequences for fields
if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) { if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
$sequence_name = $matches[1]; $sequence_name = $matches[1];
$sq = reset(get_rows((min_version(10) $sq = first(get_rows((min_version(10)
? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name)) ? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name))
: "SELECT * FROM $sequence_name" : "SELECT * FROM $sequence_name"
), null, "-- ")); ), null, "-- "));

2
adminer/drivers/sqlite.inc.php
View File

@@ -34,7 +34,7 @@ if (isset($_GET["sqlite"])) {
function quote($string) { function quote($string) {
return (is_utf8($string) return (is_utf8($string)
? "'" . $this->link->escapeString($string) . "'" ? "'" . $this->link->escapeString($string) . "'"
: "x'" . reset(unpack('H*', $string)) . "'" : "x'" . first(unpack('H*', $string)) . "'"
); );
} }

9
adminer/include/functions.inc.php
View File

@@ -847,6 +847,15 @@ function file_unlock($fp) {
fclose($fp); fclose($fp);
} }
/** Get first element of an array
* @param array
* @return mixed or false if not found
*/
function first($array) {
// reset(f()) triggers a notice
return reset($array);
}
/** Read password from file adminer.key in temporary directory or create one /** Read password from file adminer.key in temporary directory or create one
* @param bool * @param bool
* @return string or false if the file can not be created * @return string or false if the file can not be created

2
adminer/select.inc.php
View File

@@ -491,7 +491,7 @@ if (!$columns && support("table")) {
$found_rows = ($is_group ? false : found_rows($table_status, $where)); $found_rows = ($is_group ? false : found_rows($table_status, $where));
if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) { if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
// slow with big tables // slow with big tables
$found_rows = reset(slow_query(count_rows($TABLE, $where, $is_group, $group))); $found_rows = first(slow_query(count_rows($TABLE, $where, $is_group, $group)));
} else { } else {
$exact_count = false; $exact_count = false;
} }

2
adminer/sql.inc.php
View File

@@ -42,7 +42,7 @@ if (!$error && $_POST) {
if ($query != "" && strlen($query) < 1e6) { // don't add big queries if ($query != "" && strlen($query) < 1e6) { // don't add big queries
$q = $query . (preg_match("~;[ \t\r\n]*\$~", $query) ? "" : ";"); //! doesn't work with DELIMITER | $q = $query . (preg_match("~;[ \t\r\n]*\$~", $query) ? "" : ";"); //! doesn't work with DELIMITER |
if (!$history || reset(end($history)) != $q) { // no repeated queries if (!$history || first(end($history)) != $q) { // no repeated queries
restart_session(); restart_session();
$history[] = array($q, time()); //! add elapsed time $history[] = array($q, time()); //! add elapsed time
set_session("queries", $history_all); // required because reference is unlinked by stop_session() set_session("queries", $history_all); // required because reference is unlinked by stop_session()