IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor SQL generation for value columns

Browse Source
This commit is contained in:
Sven Klemm 2018-07-11 11:09:28 +02:00
parent 772825ed09
commit 5dd236bf05
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,6 +206,22 @@ export default class PostgresQuery {
return query;
}
buildValueColumns(target) {
let query = '';
for (let i = 0; i < this.selectModels.length; i++) {
let parts = this.selectModels[i];
var selectText = '';
for (let y = 0; y < parts.length; y++) {
let part = parts[y];
selectText = part.render(selectText);
}
query += ', ' + selectText;
}
return query;
}
buildQuery(target) {
var query = 'SELECT ';
@ -215,17 +231,7 @@ export default class PostgresQuery {
query += ',' + this.target.metricColumn + ' AS metric';
}
var i, y;
for (i = 0; i < this.selectModels.length; i++) {
let parts = this.selectModels[i];
var selectText = '';
for (y = 0; y < parts.length; y++) {
let part = parts[y];
selectText = part.render(selectText);
}
query += ', ' + selectText;
}
query += this.buildValueColumns(target);
query += ' FROM ' + target.schema + '.' + target.table;
var conditions = _.map(target.where, (tag, index) => {
@ -244,7 +250,7 @@ export default class PostgresQuery {
}
var groupBySection = '';
for (i = 0; i < this.groupByParts.length; i++) {
for (let i = 0; i < this.groupByParts.length; i++) {
var part = this.groupByParts[i];
if (i > 0) {
groupBySection += ', ';