IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

MSSQL/MySQL: Add correct refId when fetching variable query results (#56919)

Browse Source
This commit is contained in:
Victor Marin 2022-10-14 11:52:12 +03:00 committed by GitHub
parent 902a230867
commit b374b01260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/plugins/sql/datasource/SqlDatasource.ts
View File

@ -106,6 +106,11 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
}
async metricFindQuery(query: string, optionalOptions?: MetricFindQueryOptions): Promise<MetricFindValue[]> {
let refId = 'tempvar';
if (optionalOptions && optionalOptions.variable && optionalOptions.variable.name) {
refId = optionalOptions.variable.name;
}
const rawSql = this.templateSrv.replace(
query,
getSearchFilterScopedVar({ query, wildcardChar: '%', options: optionalOptions }),
@ -113,7 +118,7 @@ export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLO
);
const interpolatedQuery: SQLQuery = {
refId: 'tempvar',
refId: refId,
datasource: this.getRef(),
rawSql,
format: QueryFormat.Table,
@ -200,4 +205,5 @@ interface RunSQLOptions extends MetricFindQueryOptions {
interface MetricFindQueryOptions extends SearchFilterOptions {
range?: TimeRange;
variable?: VariableWithMultiSupport;
}