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

consistent nameing fro group and select

Browse Source
This commit is contained in:
Sven Klemm
2018-07-28 12:53:36 +02:00
parent ad26a319c5
commit 6ca7a03975
5 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
View File

@ -27,12 +27,12 @@ describe('PostgresQuery', function() {
describe('When generating time column SQL with group by time', function() {
let query = new PostgresQuery(
{ timeColumn: 'time', groupBy: [{ type: 'time', params: ['5m', 'none'] }] },
{ timeColumn: 'time', group: [{ type: 'time', params: ['5m', 'none'] }] },
templateSrv
);
expect(query.buildTimeColumn()).toBe('$__timeGroup(time,5m)');
query = new PostgresQuery({ timeColumn: 'time', groupBy: [{ type: 'time', params: ['5m', 'NULL'] }] }, templateSrv);
query = new PostgresQuery({ timeColumn: 'time', group: [{ type: 'time', params: ['5m', 'NULL'] }] }, templateSrv);
expect(query.buildTimeColumn()).toBe('$__timeGroup(time,5m,NULL)');
});
@ -114,13 +114,13 @@ describe('PostgresQuery', function() {
});
describe('When generating GROUP BY clause', function() {
let query = new PostgresQuery({ groupBy: [], metricColumn: 'none' }, templateSrv);
let query = new PostgresQuery({ group: [], metricColumn: 'none' }, templateSrv);
expect(query.buildGroupByClause()).toBe('');
query.target.groupBy = [{ type: 'time', params: ['5m'] }];
expect(query.buildGroupByClause()).toBe('\nGROUP BY 1');
expect(query.buildGroupClause()).toBe('');
query.target.group = [{ type: 'time', params: ['5m'] }];
expect(query.buildGroupClause()).toBe('\nGROUP BY 1');
query.target.metricColumn = 'm';
expect(query.buildGroupByClause()).toBe('\nGROUP BY 1,2');
expect(query.buildGroupClause()).toBe('\nGROUP BY 1,2');
});
describe('When generating complete statement', function() {