public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not autoquote identifiers

Browse Source
This commit is contained in:
Sven Klemm
2018-07-05 11:27:19 +02:00
parent c604651092
commit 3f614e635b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/postgres/postgres_query.ts
+5 -5
View File
@@ -164,13 +164,13 @@ export default class PostgresQuery {
} else { } else {
args = timeGroup.params[0]; args = timeGroup.params[0];
} }
query += '$__timeGroup(' + this.quoteIdentifier(target.timeColumn) + ',' + args + ')'; query += '$__timeGroup(' + target.timeColumn + ',' + args + ')';
} else { } else {
query += this.quoteIdentifier(target.timeColumn) + ' AS time'; query += target.timeColumn + ' AS "time"';
} }
if (this.target.metricColumn !== 'None') { if (this.target.metricColumn !== 'None') {
query += ',' + this.quoteIdentifier(this.target.metricColumn) + ' AS metric'; query += ',' + this.target.metricColumn + ' AS metric';
} }
var i, y; var i, y;
@@ -185,7 +185,7 @@ export default class PostgresQuery {
query += ', ' + selectText; query += ', ' + selectText;
} }
query += ' FROM ' + this.quoteIdentifier(target.schema) + '.' + this.quoteIdentifier(target.table) + ' WHERE '; query += ' FROM ' + target.schema + '.' + target.table + ' WHERE ';
var conditions = _.map(target.where, (tag, index) => { var conditions = _.map(target.where, (tag, index) => {
return tag.params.join(' '); return tag.params.join(' ');
}); });
@@ -194,7 +194,7 @@ export default class PostgresQuery {
query += '(' + conditions.join(' AND ') + ') AND '; query += '(' + conditions.join(' AND ') + ') AND ';
} }
query += '$__timeFilter(' + this.quoteIdentifier(target.timeColumn) + ')'; query += '$__timeFilter(' + target.timeColumn + ')';
var groupBySection = ''; var groupBySection = '';
for (i = 0; i < this.groupByParts.length; i++) { for (i = 0; i < this.groupByParts.length; i++) {