mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-06 14:46:36 +02:00
Code Issues Releases Wiki Activity

Elastic: Fix types

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-28 16:17:26 +01:00
parent 7a19fa67fd
commit bd823716fc
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,7 +328,7 @@ function convert_fields(array $columns, array $fields, array $select = array()):
/** Set cookie valid on current path
* @param int $lifetime number of seconds, 0 for session cookie, 2592000 - 30 days
*/
function cookie(string $name, string $value, int $lifetime = 2592000): void {
function cookie(string $name, ?string $value, int $lifetime = 2592000): void {
global $HTTPS;
header(
"Set-Cookie: $name=" . urlencode($value)
@@ -491,8 +491,10 @@ function apply_queries(string $query, array $tables, $escape = 'Adminer\table'):
return true;
}
/** Redirect by remembered queries */
function queries_redirect(string $location, string $message, bool $redirect): bool {
/** Redirect by remembered queries
* @param bool $redirect
*/
function queries_redirect(string $location, string $message, $redirect): bool {
$queries = implode("\n", Queries::$queries);
$time = format_time(Queries::$start);
return query_redirect($queries, $location, $message, $redirect, false, !$redirect, $time);

6
plugins/drivers/elastic.php
View File

@@ -508,10 +508,14 @@ if (isset($_GET["elastic"])) {
function found_rows($table_status, $where) {
}
function auto_increment(): string {
return '';
}
/** Alter type
* @return mixed
*/
function alter_table(array $table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
function alter_table(string $table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
$properties = array();
foreach ($fields as $f) {
$field_name = trim($f[1][0]);