From b1a1ad21fb0b5eac26451ff48cb32c581120b7b4 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Tue, 7 Nov 2023 00:00:14 +0100
Subject: [PATCH] [v10.2.x] InfluxDB: Fix query call with flux and sql when
 backend migration disbaled (#77761)

InfluxDB: Fix query call with flux and sql when backend migration disbaled (#77760)

Only run through with classicQuery if the language is influxql and backend migration is disabled

(cherry picked from commit 581b93c1243ab9e70167bfaba3c69dd97d4abf75)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
---
 public/app/plugins/datasource/influxdb/datasource.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 78467ba3a0f..6d78768acb2 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -138,12 +138,12 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       return merge(...streams);
     }
 
-    if (this.isMigrationToggleOnAndIsAccessProxy()) {
-      return super.query(filteredRequest);
+    if (this.version === InfluxVersion.InfluxQL && !this.isMigrationToggleOnAndIsAccessProxy()) {
+      // Fallback to classic query support
+      return this.classicQuery(request);
     }
 
-    // Fallback to classic query support
-    return this.classicQuery(request);
+    return super.query(filteredRequest);
   }
 
   getQueryDisplayText(query: InfluxQuery) {