From 7ab2f13c87d48280bcfb0715784e763223ddd0fa Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 17 Jun 2021 04:41:35 -0400
Subject: [PATCH] MSSQL: Fixes issue with hidden queries still being executed
 (#35837) (#35861)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 5f07381796c86cfd502c838fb415549ff5e32f58)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
---
 public/app/plugins/datasource/mssql/datasource.ts | 4 ++++
 public/app/plugins/datasource/mysql/datasource.ts | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts
index a4b6b072feb..3e08278a104 100644
--- a/public/app/plugins/datasource/mssql/datasource.ts
+++ b/public/app/plugins/datasource/mssql/datasource.ts
@@ -111,6 +111,10 @@ export class MssqlDatasource extends DataSourceWithBackend<MssqlQuery, MssqlOpti
       .toPromise();
   }
 
+  filterQuery(query: MssqlQuery): boolean {
+    return !query.hide;
+  }
+
   metricFindQuery(query: string, optionalOptions: any): Promise<MetricFindValue[]> {
     let refId = 'tempvar';
     if (optionalOptions && optionalOptions.variable && optionalOptions.variable.name) {
diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts
index 8e59abc2d87..4a0349744c9 100644
--- a/public/app/plugins/datasource/mysql/datasource.ts
+++ b/public/app/plugins/datasource/mysql/datasource.ts
@@ -71,10 +71,7 @@ export class MysqlDatasource extends DataSourceWithBackend<MySQLQuery, MySQLOpti
   }
 
   filterQuery(query: MySQLQuery): boolean {
-    if (query.hide) {
-      return false;
-    }
-    return true;
+    return !query.hide;
   }
 
   applyTemplateVariables(target: MySQLQuery, scopedVars: ScopedVars): Record<string, any> {