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

remove tableschema from query builder ui

Browse Source
This commit is contained in:
Sven Klemm
2018-07-27 10:58:08 +02:00
parent b3ebc86093
commit 97f24733f5
5 changed files with 73 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ export default class PostgresQuery {
this.templateSrv = templateSrv;
this.scopedVars = scopedVars;
target.schema = target.schema || 'public';
target.format = target.format || 'time_series';
target.timeColumn = target.timeColumn || 'time';
target.metricColumn = target.metricColumn || 'none';
@ -147,13 +146,15 @@ export default class PostgresQuery {
}
if (special) {
let over = '';
let overParts = [];
if (this.hasMetricColumn()) {
over = 'PARTITION BY ' + this.target.metricColumn;
overParts.push('PARTITION BY ' + this.target.metricColumn);
}
if (!aggregate) {
over += ' ORDER BY ' + this.target.timeColumn;
overParts.push('ORDER BY ' + this.target.timeColumn);
}
let over = overParts.join(' ');
switch (special.params[0]) {
case 'increase':
query = query + ' - lag(' + query + ') OVER (' + over + ')';
@ -234,7 +235,7 @@ export default class PostgresQuery {
}
query += this.buildValueColumns();
query += '\nFROM ' + this.target.schema + '.' + this.target.table;
query += '\nFROM ' + this.target.table;
query += this.buildWhereClause();
query += this.buildGroupByClause();