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

Improve queries

Browse Source 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
This commit is contained in:
Bimal Yashodha 2014-06-18 08:11:04 +05:30
parent c8e375defc
commit 56494730a4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/designer.lib.php
View File

@ -19,9 +19,10 @@ if (! defined('PHPMYADMIN')) {
function PMA_getHtmlForEditOrDeletePages($operation)
{
$cfgRelation = PMA_getRelationsParam();
$page_query = "SELECT * FROM " . PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
. " WHERE db_name = '" . $GLOBALS['db'] . "'"
$page_query = "SELECT `page_nr`, `page_descr` FROM "
. PMA_Util::backquote($cfgRelation['db']) . "."
. PMA_Util::backquote($cfgRelation['pdf_pages'])
. " WHERE db_name = '" . PMA_Util::sqlAddSlashes($GLOBALS['db']) . "'"
. " ORDER BY `page_nr`";
$page_rs = PMA_queryAsControlUser(
$page_query, false, PMA_DatabaseInterface::QUERY_STORE
@ -59,9 +60,10 @@ function PMA_getHtmlForEditOrDeletePages($operation)
function PMA_getHtmlForPageSaveAs()
{
$cfgRelation = PMA_getRelationsParam();
$page_query = "SELECT * FROM " . PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
. " WHERE db_name = '" . $GLOBALS['db'] . "'"
$page_query = "SELECT `page_nr`, `page_descr` FROM "
. PMA_Util::backquote($cfgRelation['db']) . "."
. PMA_Util::backquote($cfgRelation['pdf_pages'])
. " WHERE db_name = '" . PMA_Util::sqlAddSlashes($GLOBALS['db']) . "'"
. " ORDER BY `page_nr`";
$page_rs = PMA_queryAsControlUser(
$page_query, false, PMA_DatabaseInterface::QUERY_STORE
@ -82,7 +84,7 @@ function PMA_getHtmlForPageSaveAs()
$html .= '<td>';
$html .= '<input type="hidden" name="operation" value="save" />';
$html .= '<select name="selected_page" id="selected_page">';
$html .= '<option value="0">' . __('Select page') . '</option>';
$html .= '<option value="0">-- ' . __('Select page') . ' --</option>';
while ($curr_page = $GLOBALS['dbi']->fetchAssoc($page_rs)) {
$html .= '<option value="' . $curr_page['page_nr'] . '">';

6
libraries/pmd_common.php
View File

@ -281,7 +281,7 @@ function PMA_getPageName($pg)
return null;
}
$query = "SELECT " . PMA_Util::backquote('page_descr')
$query = "SELECT `page_descr`"
. " FROM " . PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
. " WHERE " . PMA_Util::backquote('page_nr'). " = " . $pg;
@ -336,7 +336,7 @@ function getFirstPage($db)
return null;
}
$query = "SELECT MIN(" . PMA_Util::backquote('page_nr') . ")"
$query = "SELECT MIN(`page_nr`)"
. " FROM " . PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation['pdf_pages'])
. " WHERE `db_name` = '" . $db . "'";
@ -395,7 +395,7 @@ function saveTablePositions($pg)
$queury = "INSERT INTO "
. PMA_Util::backquote($GLOBALS['cfgRelation']['db']) . "."
. PMA_Util::backquote($GLOBALS['cfgRelation']['table_coords'])
. " (db_name, table_name, pdf_page_number, x, y)"
. " (`db_name`, `table_name`, `pdf_page_number`, `x`, `y`)"
. " VALUES ("
. "'" . PMA_Util::sqlAddSlashes($DB) . "', "
. "'" . PMA_Util::sqlAddSlashes($TAB) . "', "