opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-22 20:19:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-29 14:44:23 +02:00
parent 1ee91a637f a702603e7b
commit 70daa56a31
131 changed files with 1176 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,14 +31,14 @@ export class PostgresDatasource {
return value;
}
let quotedValues = _.map(value, v => {
const quotedValues = _.map(value, v => {
return this.queryModel.quoteLiteral(v);
});
return quotedValues.join(',');
}
query(options) {
let queries = _.filter(options.targets, target => {
const queries = _.filter(options.targets, target => {
return target.hide !== true;
}).map(target => {
let queryModel = new PostgresQuery(target, this.templateSrv, options.scopedVars);
@ -111,7 +111,7 @@ export class PostgresDatasource {
};
let range = this.timeSrv.timeRange();
let data = {
const data = {
queries: [interpolatedQuery],
from: range.from.valueOf().toString(),
to: range.to.valueOf().toString(),