return $row;
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
return $this->convert(sqlsrv_fetch_array($this->result, SQLSRV_FETCH_ASSOC));
}
- function fetch_row(): array {
+ function fetch_row() {
return $this->convert(sqlsrv_fetch_array($this->result, SQLSRV_FETCH_NUMERIC));
}
}
/** Fetch next row as associative array
- * @return array<?string>
+ * @return array<?string>|false
*/
- function fetch_assoc(): array {
+ function fetch_assoc() {
return mysql_fetch_assoc($this->result);
}
/** Fetch next row as numbered array
- * @return list<?string>
+ * @return list<?string>|false
*/
- function fetch_row(): array {
+ function fetch_row() {
return mysql_fetch_row($this->result);
}
}
/** Find out if database is information_schema */
- function information_schema(string $db): bool {
+ function information_schema(?string $db): bool {
return ($db == "information_schema")
|| (min_version(5.5) && $db == "performance_schema");
}
}
/** Get SQL command to create table */
- function create_sql(string $table, bool $auto_increment, string $style): string {
+ function create_sql(string $table, ?bool $auto_increment, string $style): string {
$return = get_val("SHOW CREATE TABLE " . table($table), 1);
if (!$auto_increment) {
$return = preg_replace('~ AUTO_INCREMENT=\d+~', '', $return); //! skip comments
return $row;
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
return $this->convert(oci_fetch_assoc($this->result));
}
- function fetch_row(): array {
+ function fetch_row() {
return $this->convert(oci_fetch_row($this->result));
}
$this->num_rows = pg_num_rows($result);
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
return pg_fetch_assoc($this->result);
}
- function fetch_row(): array {
+ function fetch_row() {
return pg_fetch_row($this->result);
}
$this->result = $result;
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
return $this->result->fetchArray(SQLITE3_ASSOC);
}
- function fetch_row(): array {
+ function fetch_row() {
return $this->result->fetchArray(SQLITE3_NUM);
}
}
/** Identifier of selected database */
- function database(): string {
+ function database(): ?string {
// should be used everywhere instead of DB
return DB;
}
}
/** Print text length box in select
- * @param string $text_length result of selectLengthProcess()
+ * @param numeric-string $text_length result of selectLengthProcess()
*/
function selectLengthPrint(string $text_length): void {
if ($text_length !== null) {
}
/** Process length box in select
- * @return string number of characters to shorten texts, will be escaped
+ * @return numeric-string number of characters to shorten texts, will be escaped, empty string means unlimited
*/
function selectLengthProcess(): string {
- return (isset($_GET["text_length"]) ? $_GET["text_length"] : "100");
+ return (isset($_GET["text_length"]) ? "$_GET[text_length]" : "100");
}
/** Process extras in select form
}
/** Get options to display edit field
+ * @param ?string $table null in call.inc.php
* @param Field $field
* @param string $attrs attributes to use inside the tag
* @return string custom input field or empty string for default
*/
- function editInput(string $table, array $field, string $attrs, ?string $value): string {
+ function editInput(?string $table, array $field, string $attrs, ?string $value): string {
if ($field["type"] == "enum") {
return (isset($_GET["select"]) ? "<label><input type='radio'$attrs value='-1' checked><i>" . lang('original') . "</i></label> " : "")
. ($field["null"] ? "<label><input type='radio'$attrs value=''" . ($value !== null || isset($_GET["select"]) ? "" : " checked") . "><i>NULL</i></label> " : "")
}
/** Get hint for edit field
+ * @param ?string $table null in call.inc.php
* @param Field $field
*/
- function editHint(string $table, array $field, ?string $value): string {
+ function editHint(?string $table, array $field, ?string $value): string {
return "";
}
// interfaces can include properties only since PHP 8.4
abstract class SqlDb {
public string $extension; // extension name
- public string $flavor; // different vendor with the same API, e.g. MariaDB; usually stays empty
+ public string $flavor = ''; // different vendor with the same API, e.g. MariaDB; usually stays empty
public string $server_info; // server version
public int $affected_rows; // number of affected rows
public string $info; // see https://php.net/mysql_info
* @param list<string> $privileges
* @return Result|bool
*/
-function grant(string $grant, array $privileges, string $columns, string $on) {
+function grant(string $grant, array $privileges, ?string $columns, string $on) {
if (!$privileges) {
return true;
}
/** Get a possibly missing item from a possibly missing array
* idx($row, $key) is better than $row[$key] ?? null because PHP will report error for undefined $row
* @param ?mixed[] $array
-* @param string|int $key
+* @param array-key $key
* @param mixed $default
* @return mixed
*/
}
/** Set password to session */
-function set_password(string $vendor, string $server, string $username, ?string $password): void {
+function set_password(string $vendor, ?string $server, string $username, ?string $password): void {
$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"] && is_string($password)
? array(encrypt_string($password, $_COOKIE["adminer_key"]))
: $password
}
/** Get authenticated URL */
-function auth_url(string $vendor, string $server, string $username, string $db = null): string {
+function auth_url(string $vendor, ?string $server, string $username, string $db = null): string {
global $drivers;
$uri = remove_from_uri(implode("|", array_keys($drivers))
. "|username|ext|"
}
/** Check whether the string is in UTF-8 */
-function is_utf8(string $val): bool {
+function is_utf8(?string $val): bool {
// don't print control chars except \t\r\n
return (preg_match('~~u', $val) && !preg_match('~[\0-\x8\xB\xC\xE-\x1F]~', $val));
}
/** Format value to use in select
* @param string|string[] $val
* @param Field $field
+* @param ?numeric-string $text_length
* @return string HTML
*/
-function select_value($val, string $link, array $field, int $text_length): string {
+function select_value($val, string $link, array $field, ?string $text_length): string {
global $adminer;
if (is_array($val)) {
$return = "";
* @param Field|RoutineField $field
* @param mixed $value
*/
-function input(array $field, $value, string $function, bool $autofocus = false): void {
+function input(array $field, $value, string $function, ?bool $autofocus = false): void {
global $driver, $adminer;
$name = h(bracket_escape($field["field"]));
echo "<td class='function'>";
class PdoResult extends \PDOStatement {
public $_offset = 0, $num_rows;
- function fetch_assoc(): array {
+ function fetch_assoc() {
return $this->fetch(\PDO::FETCH_ASSOC);
}
- function fetch_row(): array {
+ function fetch_row() {
return $this->fetch(\PDO::FETCH_NUM);
}
$columns = array(); // selectable columns
$search_columns = array(); // searchable columns
$order_columns = array(); // searchable columns
-$text_length = null;
+$text_length = "";
foreach ($fields as $key => $field) {
$name = $adminer->fieldName($field);
$name_plain = html_entity_decode(strip_tags($name), ENT_QUOTES);
namespace Adminer;
$TABLE = $_GET["trigger"];
-$name = $_GET["name"];
+$name = "$_GET[name]";
$trigger_options = trigger_options();
$row = (array) trigger($name, $TABLE) + array("Trigger" => $TABLE . "_bi");
$new_grants = array();
if ($_POST) {
foreach ($_POST["objects"] as $key => $val) {
- $new_grants[$val] = (array) $new_grants[$val] + (array) $_POST["grants"][$key];
+ $new_grants[$val] = (array) $new_grants[$val] + idx($_POST["grants"], $key, array());
}
}
$grants = array();
- adminer/sqlite.php
phpVersion:
- min: 70400
+ min: 70100
max: 80499
typeAliases:
reset($this->rows);
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
$row = current($this->rows);
next($this->rows);
return $row === false ? false : array_combine($this->columns, $row);
}
- function fetch_row(): array {
+ function fetch_row() {
$row = current($this->rows);
next($this->rows);
return $row;
return $return;
}
- /** Perform query relative to actual selected DB
- * @return array|false
- */
- function query(string $path, ?array $content = null, string $method = 'GET') {
+ /** Perform query relative to actual selected DB */
+ function query(string $query, bool $unbuffered = false) {
// Support for global search through all tables
- if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) {
- $driver = driver();
-
+ if ($query[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $query, $matches)) {
$where = explode(" AND ", $matches[2]);
-
- return $driver->select($matches[1], array("*"), $where, array(), array(), $matches[3]);
+ return driver()->select($matches[1], array("*"), $where, array(), array(), $matches[3]);
}
-
- return $this->rootQuery($path, $content, $method);
}
function connect(string $server, string $username, string $password): bool {
preg_match('~^(https?://)?(.*)~', $server, $match);
$this->url = ($match[1] ?: "http://") . urlencode($username) . ":" . urlencode($password) . "@$match[2]";
- $return = $this->query('');
+ $return = $this->rootQuery('');
if ($return) {
$this->server_info = $return['version']['number'];
}
reset($this->rows);
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
$return = current($this->rows);
next($this->rows);
return $return;
}
- function fetch_row(): array {
+ function fetch_row() {
$row = $this->fetch_assoc();
return $row ? array_values($row) : false;
}
$id = trim($parts[1]);
$query = "$type/$id";
- return $this->conn->query($query, $record, 'POST');
+ return $this->conn->rootQuery($query, $record, 'POST');
}
return false;
unset($record[$key]);
}
}
- $response = $this->conn->query($query, $record, 'POST');
+ $response = $this->conn->rootQuery($query, $record, 'POST');
if ($response == false) {
return false;
}
foreach ($ids as $id) {
$query = "$table/_doc/$id";
- $response = $this->conn->query($query, null, 'DELETE');
+ $response = $this->conn->rootQuery($query, null, 'DELETE');
if (isset($response['result']) && $response['result'] == 'deleted') {
$this->conn->affected_rows++;
}
$properties = array('properties' => $properties);
}
- return connection()->query("_mapping/$name", $properties, 'PUT');
+ return connection()->rootQuery("_mapping/$name", $properties, 'PUT');
}
/** Drop types
function drop_tables(array $tables): bool {
$return = true;
foreach ($tables as $table) { //! convert to bulk api
- $return = $return && connection()->query(urlencode($table), null, 'DELETE');
+ $return = $return && connection()->rootQuery(urlencode($table), null, 'DELETE');
}
return $return;
// $this->num_rows = ibase_num_rows($result);
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
return ibase_fetch_assoc($this->result);
}
- function fetch_row(): array {
+ function fetch_row() {
return ibase_fetch_row($this->result);
}
$this->fields = array_keys(idx($result, 0, array()));
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
$row = current($this->result);
next($this->result);
return $row;
}
- function fetch_row(): array {
+ function fetch_row() {
$row = $this->fetch_assoc();
return ($row ? array_values($row) : false);
}
$this->num_rows = count($this->rows);
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
$row = current($this->rows);
if (!$row) {
return $row;
return $return;
}
- function fetch_row(): array {
+ function fetch_row() {
$return = $this->fetch_assoc();
if (!$return) {
return $return;
return (is_object($element) && $element['encoding'] == 'base64' ? base64_decode($element) : (string) $element);
}
- function fetch_assoc(): array {
+ function fetch_assoc() {
$row = current($this->rows);
if (!$row) {
return $row;
return $return;
}
- function fetch_row(): array {
+ function fetch_row() {
$return = $this->fetch_assoc();
if (!$return) {
return $return;
function editInput($table, $field, $attrs, $value) {
static $slugify;
- if (!$_GET["select"] && !$_GET["where"]) {
+ if (!$_GET["select"] && !$_GET["where"] && $table) {
if ($slugify === null) {
$slugify = array();
$prev = null;
projects / adminer.git / commitdiff