mirror of
https://github.com/grafana/grafana.git
synced 2025-08-06 20:59:35 +08:00
fix where clause generation
This commit is contained in:
@ -194,7 +194,7 @@ export default class PostgresQuery {
|
|||||||
query += ', ' + selectText;
|
query += ', ' + selectText;
|
||||||
}
|
}
|
||||||
|
|
||||||
query += ' FROM ' + target.schema + '.' + target.table + ' WHERE ';
|
query += ' FROM ' + target.schema + '.' + target.table;
|
||||||
var conditions = _.map(target.where, (tag, index) => {
|
var conditions = _.map(target.where, (tag, index) => {
|
||||||
switch (tag.type) {
|
switch (tag.type) {
|
||||||
case 'macro':
|
case 'macro':
|
||||||
@ -207,7 +207,7 @@ export default class PostgresQuery {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (conditions.length > 0) {
|
if (conditions.length > 0) {
|
||||||
query += conditions.join(' AND ');
|
query += ' WHERE ' + conditions.join(' AND ');
|
||||||
}
|
}
|
||||||
|
|
||||||
var groupBySection = '';
|
var groupBySection = '';
|
||||||
|
Reference in New Issue
Block a user