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

Use closure for calling interpolateVariable

Browse Source
This commit is contained in:
Sven Klemm
2018-10-17 12:30:07 +02:00
parent 2afec0e7fb
commit ec0fd96f08
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/postgres/datasource.ts
View File

@@ -50,7 +50,7 @@ export class PostgresDatasource {
intervalMs: options.intervalMs, intervalMs: options.intervalMs,
maxDataPoints: options.maxDataPoints, maxDataPoints: options.maxDataPoints,
datasourceId: this.id, datasourceId: this.id,
rawSql: queryModel.render(this.interpolateVariable), rawSql: queryModel.render((value, variable) => this.interpolateVariable(value, variable)),
format: target.format, format: target.format,
}; };
}); });
@@ -82,7 +82,9 @@ export class PostgresDatasource {
const query = { const query = {
refId: options.annotation.name, refId: options.annotation.name,
datasourceId: this.id, datasourceId: this.id,
rawSql: this.templateSrv.replace(options.annotation.rawQuery, options.scopedVars, this.interpolateVariable), rawSql: this.templateSrv.replace(options.annotation.rawQuery, options.scopedVars, (value, variable) =>
this.interpolateVariable(value, variable)
),
format: 'table', format: 'table',
}; };
@@ -108,7 +110,7 @@ export class PostgresDatasource {
const interpolatedQuery = { const interpolatedQuery = {
refId: refId, refId: refId,
datasourceId: this.id, datasourceId: this.id,
rawSql: this.templateSrv.replace(query, {}, this.interpolateVariable), rawSql: this.templateSrv.replace(query, {}, (value, variable) => this.interpolateVariable(value, variable)),
format: 'table', format: 'table',
}; };