From 9c8267a9a8c7aaf53879fed0b70b996331c8ce44 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Sat, 31 Aug 2013 12:42:45 +0530
Subject: [PATCH] Properly open and select database when "Use <db>" command is
 issued

---
 js/common.js |  6 ++----
 js/sql.js    | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/js/common.js b/js/common.js
index c61cd6b2cc..02dd342c78 100644
--- a/js/common.js
+++ b/js/common.js
@@ -78,7 +78,7 @@ var PMA_commonParams = (function () {
                 PMA_querywindow.refresh();
             }
             params[name] = value;
-            if(name == 'db' || name == 'table') {
+            if (name == 'db' || name == 'table') {
                 PMA_showCurrentNavigation();
             }
             return this;
@@ -117,9 +117,7 @@ var PMA_commonActions = {
      */
     setDb: function (new_db) {
         if (new_db != PMA_commonParams.get('db')) {
-            PMA_commonParams.set('db', new_db);
-            PMA_showCurrentNavigation();
-            PMA_querywindow.refresh();
+            PMA_commonParams.setAll({'db': new_db, 'table': ''});
         }
     },
     /**
diff --git a/js/sql.js b/js/sql.js
index 1d770669b6..7e847019ad 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -296,7 +296,17 @@ AJAX.registerOnload('sql.js', function() {
                 } else if (typeof data.reload != 'undefined') {
                     // this happens if a USE or DROP command was typed
                     PMA_commonActions.setDb(data.db);
-                    PMA_commonActions.refreshMain(false, function () {
+                    var url;
+                    if (data.db) {
+                        if (data.table) {
+                            url = 'table_sql.php';
+                        } else {
+                            url = 'db_sql.php';
+                        }
+                    } else {
+                        url = 'server_sql.php';
+                    }
+                    PMA_commonActions.refreshMain(url, function () {
                         if ($('#result_query').length) {
                             $('#result_query').remove();
                         }
@@ -307,7 +317,7 @@ AJAX.registerOnload('sql.js', function() {
                         }
                     });
                 }
-                
+
                 $sqlqueryresults.show().trigger('makegrid');
                 $('#togglequerybox').show();
                 PMA_init_slider();
@@ -581,7 +591,7 @@ function makeProfilingChart()
     ) {
         return;
     }
-    
+
     var data = [];
     $.each(jQuery.parseJSON($('#profilingChartData').html()),function(key,value) {
         data.push([key,parseFloat(value)]);