gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize routines

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2025-04-17 21:43:11 +01:00
parent 2916228f09
commit 9c9d5ecc40
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Database/Routine.php
View File

@ -10,6 +10,7 @@ final readonly class Routine
public string $name,
public string $type,
public string $returns,
public string $definer,
) {
}
}

19
src/Database/Routines.php
View File

@ -1162,16 +1162,8 @@ class Routines
Util::backquote($routine->name),
);
// this is for our purpose to decide whether to
// show the edit link or not, so we need the DEFINER for the routine
$where = 'ROUTINE_SCHEMA ' . Util::getCollateForIS() . '=' . $this->dbi->quoteString(Current::$database)
. ' AND SPECIFIC_NAME=' . $this->dbi->quoteString($routine->name)
. ' AND ROUTINE_TYPE=' . $this->dbi->quoteString($routine->type);
$query = 'SELECT `DEFINER` FROM INFORMATION_SCHEMA.ROUTINES WHERE ' . $where . ';';
$routineDefiner = $this->dbi->fetchValue($query);
$currentUser = $this->dbi->getCurrentUser();
$currentUserIsRoutineDefiner = $currentUser === $routineDefiner;
$currentUserIsRoutineDefiner = $currentUser === $routine->definer;
// Since editing a procedure involved dropping and recreating, check also for
// CREATE ROUTINE privilege to avoid lost procedures.
@ -1280,9 +1272,14 @@ class Routines
}
$ret = [];
/** @var array{Name:string, Type:string, DTD_IDENTIFIER:string|null} $routine */
/** @var array{Name:string, Type:string, Definer:string, DTD_IDENTIFIER:string|null} $routine */
foreach ($routines as $routine) {
$ret[] = new Routine($routine['Name'], $routine['Type'], $routine['DTD_IDENTIFIER'] ?? '');
$ret[] = new Routine(
$routine['Name'],
$routine['Type'],
$routine['DTD_IDENTIFIER'] ?? '',
$routine['Definer'],
);
}
// Sort results by name