diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php index 5aa2ee6c3..25a6458d7 100644 --- a/libraries/db_info.inc.php +++ b/libraries/db_info.inc.php @@ -9,7 +9,6 @@ * * staybyte: speedup view on locked tables - 11 June 2001 * - * @uses PMA_MYSQL_INT_VERSION * @uses $cfg['ShowStats'] * @uses $cfg['ShowTooltip'] * @uses $cfg['ShowTooltipAliasTB'] @@ -108,7 +107,7 @@ $is_show_stats = $cfg['ShowStats']; */ $db_is_information_schema = false; -if (PMA_MYSQL_INT_VERSION >= 50002 && $db == 'information_schema') { +if ($db == 'information_schema') { $is_show_stats = false; $db_is_information_schema = true; } @@ -207,7 +206,7 @@ if (! isset($sot_ready)) { $total_num_tables = count($tables); if (isset($sub_part) && $sub_part == '_export') { // (don't fetch only a subset if we are coming from db_export.php, - // because I think it's too risky to display only a subset of the + // because I think it's too risky to display only a subset of the // table names when exporting a db) /** * diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php index 873d3eb2e..ebaf6d187 100644 --- a/libraries/db_routines.inc.php +++ b/libraries/db_routines.inc.php @@ -2,10 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ - */ - -/** * @todo Support seeing the "results" of the called procedure or * function. This needs further reseach because a procedure * does not necessarily contain a SELECT statement that @@ -16,73 +12,72 @@ * our current sql.php. * Of course the interface would need a way to pass calling parameters. * Also, support DEFINER (like we do in export). + * @version $Id$ */ -if (PMA_MYSQL_INT_VERSION >= 50002) { - $url_query .= '&goto=db_structure.php'; +$url_query .= '&goto=db_structure.php'; - $routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); +$routines = PMA_DBI_fetch_result('SELECT SPECIFIC_NAME,ROUTINE_NAME,ROUTINE_TYPE,DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA= \'' . PMA_sqlAddslashes($db,true) . '\';'); - if ($routines) { - echo '
' . "\n"; - echo ' ' . $strRoutines . '' . "\n"; - echo ''; - echo sprintf(' - - - - - - ', - $strName, - $strType, - $strRoutineReturnType); - $ct=0; - $delimiter = '//'; - foreach ($routines as $routine) { +if ($routines) { + echo '
' . "\n"; + echo ' ' . $strRoutines . '' . "\n"; + echo '
%s  %s%s
'; + echo sprintf(' + + + + + + ', + $strName, + $strType, + $strRoutineReturnType); + $ct=0; + $delimiter = '//'; + foreach ($routines as $routine) { - // information_schema (at least in MySQL 5.0.45) - // does not return the routine parameters - // so we rely on PMA_DBI_get_procedure_or_function_def() which - // uses SHOW CREATE + // information_schema (at least in MySQL 5.0.45) + // does not return the routine parameters + // so we rely on PMA_DBI_get_procedure_or_function_def() which + // uses SHOW CREATE - $definition = 'DROP ' . $routine['ROUTINE_TYPE'] . ' ' . PMA_backquote($routine['SPECIFIC_NAME']) . $delimiter . "\n" - . PMA_DBI_get_procedure_or_function_def($db, $routine['ROUTINE_TYPE'], $routine['SPECIFIC_NAME']) - . "\n"; + $definition = 'DROP ' . $routine['ROUTINE_TYPE'] . ' ' . PMA_backquote($routine['SPECIFIC_NAME']) . $delimiter . "\n" + . PMA_DBI_get_procedure_or_function_def($db, $routine['ROUTINE_TYPE'], $routine['SPECIFIC_NAME']) + . "\n"; - //if ($routine['ROUTINE_TYPE'] == 'PROCEDURE') { - // $sqlUseProc = 'CALL ' . $routine['SPECIFIC_NAME'] . '()'; - //} else { - // $sqlUseProc = 'SELECT ' . $routine['SPECIFIC_NAME'] . '()'; - /* this won't get us far: to really use the function - i'd need to know how many parameters the function needs and then create - something to ask for them. As i don't see this directly in - the table i am afraid that requires parsing the ROUTINE_DEFINITION - and i don't really need that now so i simply don't offer - a method for running the function*/ - //} - if ($routine['ROUTINE_TYPE'] == 'PROCEDURE') { - $sqlDropProc = 'DROP PROCEDURE ' . PMA_backquote($routine['SPECIFIC_NAME']); - } else { - $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']); - } - echo sprintf(' - - - - - - ', - ($ct%2 == 0) ? 'even' : 'odd', - $routine['ROUTINE_NAME'], - ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', - //$routine['ROUTINE_TYPE'] == 'PROCEDURE' ? '' . $titles['Browse'] . '' : ' ', - '' . $titles['Drop'] . '', - $routine['ROUTINE_TYPE'], - $routine['DTD_IDENTIFIER']); - $ct++; + //if ($routine['ROUTINE_TYPE'] == 'PROCEDURE') { + // $sqlUseProc = 'CALL ' . $routine['SPECIFIC_NAME'] . '()'; + //} else { + // $sqlUseProc = 'SELECT ' . $routine['SPECIFIC_NAME'] . '()'; + /* this won't get us far: to really use the function + i'd need to know how many parameters the function needs and then create + something to ask for them. As i don't see this directly in + the table i am afraid that requires parsing the ROUTINE_DEFINITION + and i don't really need that now so i simply don't offer + a method for running the function*/ + //} + if ($routine['ROUTINE_TYPE'] == 'PROCEDURE') { + $sqlDropProc = 'DROP PROCEDURE ' . PMA_backquote($routine['SPECIFIC_NAME']); + } else { + $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']); } - echo '
%s  %s%s
%s%s%s%s%s
'; - echo '
' . "\n"; + echo sprintf(' + %s + %s + %s + %s + %s + ', + ($ct%2 == 0) ? 'even' : 'odd', + $routine['ROUTINE_NAME'], + ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ', + //$routine['ROUTINE_TYPE'] == 'PROCEDURE' ? '' . $titles['Browse'] . '' : ' ', + '' . $titles['Drop'] . '', + $routine['ROUTINE_TYPE'], + $routine['DTD_IDENTIFIER']); + $ct++; } + echo ''; + echo '' . "\n"; } ?>