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

Merge pull request #538 from scnakandala/gsoc_2013

Browse Source 
Refactoring SQL executor
This commit is contained in:
Marc Delisle 2013-07-23 12:30:01 -07:00
commit 1c2929a57e
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
db_qbe.php
View File

@ -11,6 +11,9 @@
*/
require_once 'libraries/common.inc.php';
require_once 'libraries/DBQbe.class.php';
require_once 'libraries/bookmark.lib.php';
require_once 'libraries/sql.lib.php';
$response = PMA_Response::getInstance();
// Gets the relation settings
@ -25,8 +28,15 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
$message_to_display = true;
} else {
$goto = 'db_sql.php';
include 'sql.php';
exit;
// Parse and analyze the query
require_once 'libraries/parse_analyze.inc.php';
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $_REQUEST['db'], null, null, null, null,
false, null, null, null, null, $goto, $pmaThemeImage, null, null, null,
$sql_query, null, null
);
}
}

2
libraries/sql.lib.php
View File

@ -2253,7 +2253,7 @@ function PMA_executeQueryAndSendQueryResponse($analyzed_sql_results,
$query_type, $sql_query, $selected, $complete_query
) {
// Include PMA_Index class for use in PMA_DisplayResults class
include './libraries/Index.class.php';
include_once './libraries/Index.class.php';
include 'libraries/DisplayResults.class.php';

13
tbl_structure.php
View File

@ -18,6 +18,8 @@ require_once 'libraries/mysql_charsets.inc.php';
*/
require_once 'libraries/structure.lib.php';
require_once 'libraries/index.lib.php';
require_once 'libraries/sql.lib.php';
require_once 'libraries/bookmark.lib.php';
$response = PMA_Response::getInstance();
$header = $response->getHeader();
@ -103,8 +105,15 @@ if (! empty($submit_mult)) {
}
$sql_query .= ' FROM ' . PMA_Util::backquote($db)
. '.' . PMA_Util::backquote($table);
include 'sql.php';
exit;
// Parse and analyze the query
require_once 'libraries/parse_analyze.inc.php';
PMA_executeQueryAndSendQueryResponse(
$analyzed_sql_results, false, $db, $table, null, null, null, false, null,
null, null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
null, null
);
} else {
// handle multiple field commands
// handle confirmation of deleting multiple fields/columns