From 6be92aa05dbf5a8971795dac3f1d05b04993949a Mon Sep 17 00:00:00 2001
From: Allen Short <ashort@mozilla.com>
Date: Fri, 10 Feb 2017 00:49:30 -0600
Subject: [PATCH] Don't execute query when changing data sources (fixes #29)

---
 client/app/pages/queries/query.html | 2 +-
 client/app/pages/queries/view.js    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index c9cdd09e96..b32f66d6fe 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -221,7 +221,7 @@ <h3>
               <!-- End of Query Execution Status -->
 
               <!-- tabs and data -->
-              <div ng-if="showDataset" class="flex-fill p-relative">
+              <div ng-if="showDataset && !dataSourceChanged" class="flex-fill p-relative">
                 <div class="d-flex flex-column p-absolute static-position__mobile" style="left: 0; top: 0; right: 0; bottom: 0;">
                   <div class="p-10" ng-show="showLog">
                     <p>Log Information:</p>
diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js
index 4e2d19826f..cda113adfc 100644
--- a/client/app/pages/queries/view.js
+++ b/client/app/pages/queries/view.js
@@ -136,6 +136,7 @@ function QueryViewCtrl(
     Notifications.getPermissions();
   };
 
+  $scope.dataSourceChanged = false;
   $scope.selectedVisualization = DEFAULT_VISUALIZATION;
   $scope.currentUser = currentUser;
   $scope.dataSource = {};
@@ -360,7 +361,7 @@ function QueryViewCtrl(
 
     $scope.dataSource = find($scope.dataSources, ds => ds.id === $scope.query.data_source_id);
     getSchema();
-    $scope.executeQuery();
+    $scope.dataSourceChanged = true;
   };
 
   $scope.setVisualizationTab = (visualization) => {