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

rename PostgresQueryBuilder to PostgresMetaQuery

Browse Source
This commit is contained in:
Sven Klemm
2018-07-15 17:12:03 +02:00
parent 070b556fd3
commit b28bf1a4f9
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/postgres/query_builder.ts → public/app/plugins/datasource/postgres/meta_query.ts
View File

@@ -1,4 +1,4 @@
export class PostgresQueryBuilder { export class PostgresMetaQuery {
constructor(private target, private queryModel) {} constructor(private target, private queryModel) {}
// quote identifier as literal to use in metadata queries // quote identifier as literal to use in metadata queries

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

@@ -2,7 +2,6 @@ import _ from 'lodash';
export default class PostgresQuery { export default class PostgresQuery {
target: any; target: any;
queryBuilder: any;
templateSrv: any; templateSrv: any;
scopedVars: any; scopedVars: any;

28
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@@ -1,5 +1,5 @@
import _ from 'lodash'; import _ from 'lodash';
import { PostgresQueryBuilder } from './query_builder'; import { PostgresMetaQuery } from './meta_query';
import { QueryCtrl } from 'app/plugins/sdk'; import { QueryCtrl } from 'app/plugins/sdk';
import { SqlPart } from 'app/core/components/sql_part/sql_part'; import { SqlPart } from 'app/core/components/sql_part/sql_part';
import PostgresQuery from './postgres_query'; import PostgresQuery from './postgres_query';
@@ -24,7 +24,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
showLastQuerySQL: boolean; showLastQuerySQL: boolean;
formats: any[]; formats: any[];
queryModel: PostgresQuery; queryModel: PostgresQuery;
queryBuilder: PostgresQueryBuilder; metaBuilder: PostgresMetaQuery;
lastQueryMeta: QueryMeta; lastQueryMeta: QueryMeta;
lastQueryError: string; lastQueryError: string;
showHelp: boolean; showHelp: boolean;
@@ -44,7 +44,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
super($scope, $injector); super($scope, $injector);
this.target = this.target; this.target = this.target;
this.queryModel = new PostgresQuery(this.target, templateSrv, this.panel.scopedVars); this.queryModel = new PostgresQuery(this.target, templateSrv, this.panel.scopedVars);
this.queryBuilder = new PostgresQueryBuilder(this.target, this.queryModel); this.metaBuilder = new PostgresMetaQuery(this.target, this.queryModel);
this.updateProjection(); this.updateProjection();
this.formats = [{ text: 'Time series', value: 'time_series' }, { text: 'Table', value: 'table' }]; this.formats = [{ text: 'Time series', value: 'time_series' }, { text: 'Table', value: 'table' }];
@@ -121,7 +121,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
getSchemaSegments() { getSchemaSegments() {
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildSchemaQuery()) .metricFindQuery(this.metaBuilder.buildSchemaQuery())
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
@@ -133,7 +133,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
getTableSegments() { getTableSegments() {
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildTableQuery()) .metricFindQuery(this.metaBuilder.buildTableQuery())
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
@@ -145,7 +145,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
getTimeColumnSegments() { getTimeColumnSegments() {
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildColumnQuery('time')) .metricFindQuery(this.metaBuilder.buildColumnQuery('time'))
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
@@ -157,7 +157,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
getMetricColumnSegments() { getMetricColumnSegments() {
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildColumnQuery('metric')) .metricFindQuery(this.metaBuilder.buildColumnQuery('metric'))
.then(this.transformToSegments({ addNone: true })) .then(this.transformToSegments({ addNone: true }))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
@@ -285,12 +285,12 @@ export class PostgresQueryCtrl extends QueryCtrl {
switch (part.def.type) { switch (part.def.type) {
case 'aggregate': case 'aggregate':
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildAggregateQuery()) .metricFindQuery(this.metaBuilder.buildAggregateQuery())
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
case 'column': case 'column':
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildColumnQuery('value')) .metricFindQuery(this.metaBuilder.buildColumnQuery('value'))
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
@@ -314,7 +314,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
switch (evt.name) { switch (evt.name) {
case 'get-param-options': { case 'get-param-options': {
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildColumnQuery()) .metricFindQuery(this.metaBuilder.buildColumnQuery())
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
} }
@@ -385,16 +385,16 @@ export class PostgresQueryCtrl extends QueryCtrl {
switch (evt.param.name) { switch (evt.param.name) {
case 'left': case 'left':
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildColumnQuery()) .metricFindQuery(this.metaBuilder.buildColumnQuery())
.then(this.transformToSegments({})) .then(this.transformToSegments({}))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
case 'right': case 'right':
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildValueQuery(part.params[0])) .metricFindQuery(this.metaBuilder.buildValueQuery(part.params[0]))
.then(this.transformToSegments({ addTemplateVars: true, templateQuoter: this.queryModel.quoteLiteral })) .then(this.transformToSegments({ addTemplateVars: true, templateQuoter: this.queryModel.quoteLiteral }))
.catch(this.handleQueryError.bind(this)); .catch(this.handleQueryError.bind(this));
case 'op': case 'op':
return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<', '<=', '>', '>=', 'IN'])); return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<', '<=', '>', '>=', 'IN', 'NOT IN']));
default: default:
return this.$q.when([]); return this.$q.when([]);
} }
@@ -442,7 +442,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
getGroupByOptions() { getGroupByOptions() {
return this.datasource return this.datasource
.metricFindQuery(this.queryBuilder.buildColumnQuery('groupby')) .metricFindQuery(this.metaBuilder.buildColumnQuery('groupby'))
.then(tags => { .then(tags => {
var options = []; var options = [];
if (!this.queryModel.hasGroupByTime()) { if (!this.queryModel.hasGroupByTime()) {