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

Merge pull request #507 from scnakandala/gsoc_2013

Browse Source 
Refactoring SQL executor
This commit is contained in:
Marc Delisle 2013-07-15 08:15:15 -07:00
commit cc746b68db
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/sql.lib.php
View File

@ -1819,17 +1819,18 @@ function PMA_getBookmarkCreatedMessage()
* @param object $result result of the executed query
* @param int $querytime query execution time
* @param array $analyzed_sql_results analyzed sql results
* @param bool $is_procedure whether it is a procedure call or not
*
* @return type
*/
function PMA_getHtmlForSqlQueryResultsTable($sql_data, $displayResultsObject, $db,
$goto, $pmaThemeImage, $text_dir, $url_query, $disp_mode, $sql_limit_to_append,
$editable, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
$analyzed_sql_results, $is_procedure
$analyzed_sql_results
) {
$printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
if (! empty($sql_data) && ($sql_data['valid_queries'] > 1) || $is_procedure) {
if (! empty($sql_data) && ($sql_data['valid_queries'] > 1)
|| $analyzed_sql_results['is_procedure']
) {
$_SESSION['is_multi_query'] = true;
$table_html = PMA_getTableHtmlForMultipleQueries(
$displayResultsObject, $db, $sql_data, $goto,

2
sql.php
View File

@ -321,7 +321,7 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
isset($sql_data) ? $sql_data : null, $displayResultsObject, $db, $goto,
$pmaThemeImage, $text_dir, $url_query, $disp_mode, $sql_limit_to_append,
$editable, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
$analyzed_sql_results, $is_procedure
$analyzed_sql_results
);
$indexes_problems_html = PMA_getHtmlForIndexesProblems(