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

remove dead code from sql_part

Browse Source 
fix where clause query generation
This commit is contained in:
Sven Klemm
2018-07-04 15:37:06 +02:00
parent 3b632510fb
commit 7d30ca04de
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/plugins/datasource/postgres/postgres_query.ts
View File

@ -56,6 +56,9 @@ export default class PostgresQuery {
this.target.where = _.map(this.whereParts, function(part: any) {
return { type: part.def.type, params: part.params };
});
this.target.groupBy = _.map(this.groupByParts, function(part: any) {
return { type: part.def.type, params: part.params };
});
}
hasGroupByTime() {
@ -197,7 +200,7 @@ export default class PostgresQuery {
});
if (conditions.length > 0) {
query += '(' + conditions.join(' ') + ') AND ';
query += '(' + conditions.join(' AND ') + ') AND ';
}
query += '$__timeFilter(' + this.quoteIdentifier(target.timeColumn) + ')';