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

dont autoquote, suggest quoted values if requried

Browse Source
This commit is contained in:
Sven Klemm 2018-07-05 21:36:39 +02:00
parent 3f614e635b
commit d8c7756489
3 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,14 @@ export default class PostgresQuery {
this.updateProjection();
}
unquoteIdentifier(value) {
if (value[0] === '"') {
return value.substring(1, value.length - 1).replace('""', '"');
} else {
return value;
}
}
quoteIdentifier(value) {
return '"' + value.replace('"', '""') + '"';
}

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

@ -1,35 +1,39 @@
export class PostgresQueryBuilder {
constructor(private target, private queryModel) {}
buildSchemaQuery() {
var query = "SELECT schema_name FROM information_schema.schemata WHERE";
var query = 'SELECT quote_ident(schema_name) FROM information_schema.schemata WHERE';
query += " schema_name NOT LIKE 'pg_%' AND schema_name NOT LIKE '\\_%' AND schema_name <> 'information_schema';";
return query;
}
buildTableQuery() {
var query = "SELECT table_name FROM information_schema.tables WHERE ";
query += "table_schema = " + this.queryModel.quoteLiteral(this.target.schema);
var query = 'SELECT quote_ident(table_name) FROM information_schema.tables WHERE ';
query += 'table_schema = ' + this.quoteLiteral(this.target.schema);
return query;
}
quoteLiteral(value) {
return this.queryModel.quoteLiteral(this.queryModel.unquoteIdentifier(value));
}
buildColumnQuery(type?: string) {
var query = "SELECT column_name FROM information_schema.columns WHERE ";
query += "table_schema = " + this.queryModel.quoteLiteral(this.target.schema);
query += " AND table_name = " + this.queryModel.quoteLiteral(this.target.table);
var query = 'SELECT quote_ident(column_name) FROM information_schema.columns WHERE ';
query += 'table_schema = ' + this.quoteLiteral(this.target.schema);
query += ' AND table_name = ' + this.quoteLiteral(this.target.table);
switch (type) {
case "time": {
query += " AND data_type IN ('timestamp without time zone','timestamp with time zone','bigint','integer','double precision','real')";
case 'time': {
query +=
" AND data_type IN ('timestamp without time zone','timestamp with time zone','bigint','integer','double precision','real')";
break;
}
case "metric": {
case 'metric': {
query += " AND data_type IN ('text','char','varchar')";
break;
}
case "value": {
case 'value': {
query += " AND data_type IN ('bigint','integer','double precision','real')";
break;
}
@ -39,27 +43,25 @@ export class PostgresQueryBuilder {
}
buildValueQuery(column: string) {
var query = "SELECT DISTINCT quote_literal(" + this.queryModel.quoteIdentifier(column) + ")";
query += " FROM " + this.queryModel.quoteIdentifier(this.target.schema);
query += "." + this.queryModel.quoteIdentifier(this.target.table);
query += " ORDER BY 1 LIMIT 100";
var query = 'SELECT DISTINCT quote_literal(' + column + ')';
query += ' FROM ' + this.target.schema + '.' + this.target.table;
query += ' ORDER BY 1 LIMIT 100';
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);
var query = 'SELECT data_type FROM information_schema.columns WHERE ';
query += ' table_schema = ' + this.quoteLiteral(this.target.schema);
query += ' AND table_name = ' + this.quoteLiteral(this.target.table);
query += ' AND column_name = ' + this.quoteLiteral(column);
return query;
}
buildAggregateQuery() {
var query = "SELECT DISTINCT proname FROM pg_aggregate ";
query += "INNER JOIN pg_proc ON pg_aggregate.aggfnoid = pg_proc.oid ";
query += "INNER JOIN pg_type ON pg_type.oid=pg_proc.prorettype ";
var query = 'SELECT DISTINCT proname FROM pg_aggregate ';
query += 'INNER JOIN pg_proc ON pg_aggregate.aggfnoid = pg_proc.oid ';
query += 'INNER JOIN pg_type ON pg_type.oid=pg_proc.prorettype ';
query += "WHERE pronargs=1 AND typname IN ('int8','float8') AND aggkind='n' ORDER BY 1";
return query;
}
}

2
public/app/plugins/datasource/postgres/sql_part.ts
View File

@ -25,7 +25,7 @@ function aggregateRenderer(part, innerExpr) {
}
function columnRenderer(part, innerExpr) {
return '"' + part.params[0] + '"';
return part.params[0];
}
function replaceAggregationAddStrategy(selectParts, partModel) {