From 9be7d5867f5ef4897bffe39c5e59e82a24b7653e Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Thu, 28 May 2020 14:28:56 +0200 Subject: [PATCH] Add truthy rawQuery as we are interpolating raw query only (#25110) --- public/app/plugins/datasource/mssql/datasource.ts | 1 + public/app/plugins/datasource/mysql/datasource.ts | 1 + public/app/plugins/datasource/postgres/datasource.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/public/app/plugins/datasource/mssql/datasource.ts b/public/app/plugins/datasource/mssql/datasource.ts index 21bdbf70913..1582b077797 100644 --- a/public/app/plugins/datasource/mssql/datasource.ts +++ b/public/app/plugins/datasource/mssql/datasource.ts @@ -55,6 +55,7 @@ export class MssqlDatasource { ...query, datasource: this.name, rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable), + rawQuery: true, }; return expandedQuery; }); diff --git a/public/app/plugins/datasource/mysql/datasource.ts b/public/app/plugins/datasource/mysql/datasource.ts index 2bb39ebf0e1..063c1642bcf 100644 --- a/public/app/plugins/datasource/mysql/datasource.ts +++ b/public/app/plugins/datasource/mysql/datasource.ts @@ -56,6 +56,7 @@ export class MysqlDatasource { ...query, datasource: this.name, rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable), + rawQuery: true, }; return expandedQuery; }); diff --git a/public/app/plugins/datasource/postgres/datasource.ts b/public/app/plugins/datasource/postgres/datasource.ts index c4a3723722b..0536301361f 100644 --- a/public/app/plugins/datasource/postgres/datasource.ts +++ b/public/app/plugins/datasource/postgres/datasource.ts @@ -61,6 +61,7 @@ export class PostgresDatasource { ...query, datasource: this.name, rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable), + rawQuery: true, }; return expandedQuery; });