Commit 7b656097 by Marcus Efraimsson

postgres: use arrow function declaration of interpolateVariable

parent ec0fd96f
...@@ -20,7 +20,7 @@ export class PostgresDatasource { ...@@ -20,7 +20,7 @@ export class PostgresDatasource {
this.interval = (instanceSettings.jsonData || {}).timeInterval; this.interval = (instanceSettings.jsonData || {}).timeInterval;
} }
interpolateVariable(value, variable) { interpolateVariable = (value, variable) => {
if (typeof value === 'string') { if (typeof value === 'string') {
if (variable.multi || variable.includeAll) { if (variable.multi || variable.includeAll) {
return this.queryModel.quoteLiteral(value); return this.queryModel.quoteLiteral(value);
...@@ -37,7 +37,7 @@ export class PostgresDatasource { ...@@ -37,7 +37,7 @@ export class PostgresDatasource {
return this.queryModel.quoteLiteral(v); return this.queryModel.quoteLiteral(v);
}); });
return quotedValues.join(','); return quotedValues.join(',');
} };
query(options) { query(options) {
const queries = _.filter(options.targets, target => { const queries = _.filter(options.targets, target => {
...@@ -50,7 +50,7 @@ export class PostgresDatasource { ...@@ -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((value, variable) => this.interpolateVariable(value, variable)), rawSql: queryModel.render(this.interpolateVariable),
format: target.format, format: target.format,
}; };
}); });
...@@ -82,9 +82,7 @@ export class PostgresDatasource { ...@@ -82,9 +82,7 @@ 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, (value, variable) => rawSql: this.templateSrv.replace(options.annotation.rawQuery, options.scopedVars, this.interpolateVariable),
this.interpolateVariable(value, variable)
),
format: 'table', format: 'table',
}; };
...@@ -110,7 +108,7 @@ export class PostgresDatasource { ...@@ -110,7 +108,7 @@ export class PostgresDatasource {
const interpolatedQuery = { const interpolatedQuery = {
refId: refId, refId: refId,
datasourceId: this.id, datasourceId: this.id,
rawSql: this.templateSrv.replace(query, {}, (value, variable) => this.interpolateVariable(value, variable)), rawSql: this.templateSrv.replace(query, {}, this.interpolateVariable),
format: 'table', format: 'table',
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment