opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

add regex operators

Browse Source
This commit is contained in:
Sven Klemm
2018-03-13 23:06:39 +01:00
parent 046ee8efd8
commit b7c7030a46
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/postgres/query_builder.ts
View File

@ -47,4 +47,12 @@ export class PostgresQueryBuilder {
return query; return query;
} }
buildDatatypeQuery(column: string) {
var query = "SELECT data_type FROM information_schema.columns WHERE ";
query += " table_schema = " + this.queryModel.quoteLiteral(this.target.schema);
query += " AND table_name = " + this.queryModel.quoteLiteral(this.target.table);
query += " AND column_name = " + this.queryModel.quoteLiteral(column);
return query;
}
} }

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

@ -266,14 +266,28 @@ export class PostgresQueryCtrl extends QueryCtrl {
} }
getWhereSegments(segment, index) { getWhereSegments(segment, index) {
var query, addTemplateVars;
if (segment.type === 'condition') { if (segment.type === 'condition') {
return this.$q.when([this.uiSegmentSrv.newSegment('AND'), this.uiSegmentSrv.newSegment('OR')]); return this.$q.when([this.uiSegmentSrv.newSegment('AND'), this.uiSegmentSrv.newSegment('OR')]);
} }
if (segment.type === 'operator') { if (segment.type === 'operator') {
return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<>', '<', '>'])); var columnName = this.whereSegments[index - 1].value;
query = this.queryBuilder.buildDatatypeQuery(columnName);
return this.datasource.metricFindQuery(query)
.then(results => {
var datatype = results[0].text;
switch (datatype) {
case "text":
case "character varying":
return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '~', '~*','!~','!~*','IN']));
default:
return this.$q.when(this.uiSegmentSrv.newOperators(['=', '!=', '<', '<=', '>', '>=']));
}
})
.catch(this.handleQueryError.bind(this));
} }
var query, addTemplateVars;
if (segment.type === 'key' || segment.type === 'plus-button') { if (segment.type === 'key' || segment.type === 'plus-button') {
query = this.queryBuilder.buildColumnQuery(); query = this.queryBuilder.buildColumnQuery();