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

fix order for mysql, remove postgres specific code

Browse Source
This commit is contained in:
Sven Klemm
2018-10-19 18:23:03 +02:00
parent 8ce7e113d9
commit 7c8b4915c1
1 changed files with 3 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
public/app/plugins/datasource/mysql/mysql_query.ts
View File

@@ -152,64 +152,12 @@ export default class MysqlQuery {
const columnName = _.find(column, (g: any) => g.type === 'column'); const columnName = _.find(column, (g: any) => g.type === 'column');
query = columnName.params[0]; query = columnName.params[0];
const aggregate = _.find(column, (g: any) => g.type === 'aggregate' || g.type === 'percentile'); const aggregate = _.find(column, (g: any) => g.type === 'aggregate');
const windows = _.find(column, (g: any) => g.type === 'window' || g.type === 'moving_window');
if (aggregate) { if (aggregate) {
const func = aggregate.params[0]; const func = aggregate.params[0];
switch (aggregate.type) {
case 'aggregate':
if (func === 'first' || func === 'last') {
query = func + '(' + query + ',' + this.target.timeColumn + ')';
} else {
query = func + '(' + query + ')'; query = func + '(' + query + ')';
} }
break;
case 'percentile':
query = func + '(' + aggregate.params[1] + ') WITHIN GROUP (ORDER BY ' + query + ')';
break;
}
}
if (windows) {
const overParts = [];
if (this.hasMetricColumn()) {
overParts.push('PARTITION BY ' + this.target.metricColumn);
}
overParts.push('ORDER BY ' + this.buildTimeColumn(false));
const over = overParts.join(' ');
let curr: string;
let prev: string;
switch (windows.type) {
case 'window':
switch (windows.params[0]) {
case 'increase':
curr = query;
prev = 'lag(' + curr + ') OVER (' + over + ')';
query = '(CASE WHEN ' + curr + ' >= ' + prev + ' THEN ' + curr + ' - ' + prev + ' ELSE ' + curr + ' END)';
break;
case 'rate':
let timeColumn = this.target.timeColumn;
if (aggregate) {
timeColumn = 'min(' + timeColumn + ')';
}
curr = query;
prev = 'lag(' + curr + ') OVER (' + over + ')';
query = '(CASE WHEN ' + curr + ' >= ' + prev + ' THEN ' + curr + ' - ' + prev + ' ELSE ' + curr + ' END)';
query += '/extract(epoch from ' + timeColumn + ' - lag(' + timeColumn + ') OVER (' + over + '))';
break;
default:
query = windows.params[0] + '(' + query + ') OVER (' + over + ')';
break;
}
break;
case 'moving_window':
query = windows.params[0] + '(' + query + ') OVER (' + over + ' ROWS ' + windows.params[1] + ' PRECEDING)';
break;
}
}
const alias = _.find(column, (g: any) => g.type === 'alias'); const alias = _.find(column, (g: any) => g.type === 'alias');
if (alias) { if (alias) {
@@ -278,7 +226,7 @@ export default class MysqlQuery {
query += this.buildWhereClause(); query += this.buildWhereClause();
query += this.buildGroupClause(); query += this.buildGroupClause();
query += '\nORDER BY 1'; query += '\nORDER BY ' + this.buildTimeColumn(false);
return query; return query;
} }