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

Replaced PMA_RTN_parseAllParameters().

Browse Source 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
This commit is contained in:
Dan Ungureanu 2015-06-13 13:53:35 +03:00
parent ee6dd2e7c0
commit 50a2021faf
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/rte/rte_list.lib.php
View File

@ -220,16 +220,13 @@ function PMA_RTN_getRowForList($routine, $rowclass = '')
// Check if the routine has any input parameters. If it does,
// we will show a dialog to get values for these parameters,
// otherwise we can execute it directly.
$params = PMA_RTN_parseAllParameters(
PMA_SQP_parse(
$GLOBALS['dbi']->getDefinition(
$db,
$routine['type'],
$routine['name']
)
),
$routine['type']
);
$parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition(
$db,
$routine['type'],
$routine['name']
));
$params = SqlParser\Utils\Routine::getParameters($parser->statements[0]);
if ($routine !== false) {
if (PMA_Util::currentUserHasPrivilege('EXECUTE', $db)) {
$execute_action = 'execute_routine';

14
libraries/rte/rte_routines.lib.php
View File

@ -694,14 +694,12 @@ function PMA_RTN_getDataFromName($name, $type, $all = true)
// Get required data
$retval['item_name'] = $routine['SPECIFIC_NAME'];
$retval['item_type'] = $routine['ROUTINE_TYPE'];
$parsed_query = PMA_SQP_parse(
$GLOBALS['dbi']->getDefinition(
$db,
$routine['ROUTINE_TYPE'],
$routine['SPECIFIC_NAME']
)
);
$params = PMA_RTN_parseAllParameters($parsed_query, $routine['ROUTINE_TYPE']);
$parser = new SqlParser\Parser($GLOBALS['dbi']->getDefinition(
$db,
$routine['ROUTINE_TYPE'],
$routine['SPECIFIC_NAME']
));
$params = SqlParser\Utils\Routine::getParameters($parser->statements[0]);
$retval['item_num_params'] = $params['num'];
$retval['item_param_dir'] = $params['dir'];
$retval['item_param_name'] = $params['name'];