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

Merge branch 'master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-31 19:02:46 +02:00
parent 650e2faf01 abbb6f933c
commit 265d5daf57
183 changed files with 1048 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/postgres/meta_query.ts
View File

@ -25,7 +25,7 @@ export class PostgresMetaQuery {
findMetricTable() {
// query that returns first table found that has a timestamp(tz) column and a float column
let query = `
const query = `
SELECT
quote_ident(table_name) as table_name,
( SELECT
@ -74,7 +74,7 @@ LIMIT 1
}
buildSchemaConstraint() {
let query = `
const query = `
table_schema IN (
SELECT CASE WHEN trim(unnest) = \'"$user"\' THEN user ELSE trim(unnest) END
FROM unnest(string_to_array(current_setting(\'search_path\'),\',\'))
@ -87,7 +87,7 @@ table_schema IN (
// check for schema qualified table
if (table.includes('.')) {
let parts = table.split('.');
const parts = table.split('.');
query = 'table_schema = ' + this.quoteIdentAsLiteral(parts[0]);
query += ' AND table_name = ' + this.quoteIdentAsLiteral(parts[1]);
return query;