From 56494730a4866d78ad99bc1eb4da375ccef3d9ea Mon Sep 17 00:00:00 2001
From: Bimal Yashodha <kb.yashodha@gmail.com>
Date: Wed, 18 Jun 2014 08:11:04 +0530
Subject: [PATCH] Improve queries

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
---
 libraries/designer.lib.php | 16 +++++++++-------
 libraries/pmd_common.php   |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libraries/designer.lib.php b/libraries/designer.lib.php
index c1cb67fda8..c2668e99f3 100644
--- a/libraries/designer.lib.php
+++ b/libraries/designer.lib.php
@@ -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'] . '">';
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index b1ef201873..85be4507a0 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -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) . "', "