From 1dd8192d5172fd2f321b87e8998266e3cd630980 Mon Sep 17 00:00:00 2001 From: Sven Klemm Date: Mon, 13 Aug 2018 09:57:46 +0200 Subject: [PATCH] fix datatype query --- public/app/plugins/datasource/postgres/meta_query.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/datasource/postgres/meta_query.ts b/public/app/plugins/datasource/postgres/meta_query.ts index c8a65990e56..414bbe654ef 100644 --- a/public/app/plugins/datasource/postgres/meta_query.ts +++ b/public/app/plugins/datasource/postgres/meta_query.ts @@ -133,14 +133,17 @@ table_schema IN ( buildDatatypeQuery(column: string) { let query = ` -SELECT data_type +SELECT udt_name FROM information_schema.columns WHERE table_schema IN ( - SELECT CASE WHEN trim(unnest) = \'"$user"\' THEN user ELSE trim(unnest) END - FROM unnest(string_to_array(current_setting(\'search_path\'),\',\')) - LIMIT 1 + SELECT schema FROM ( + SELECT CASE WHEN trim(unnest) = \'"$user"\' THEN user ELSE trim(unnest) END as schema + FROM unnest(string_to_array(current_setting(\'search_path\'),\',\')) + ) s + WHERE EXISTS (SELECT 1 FROM information_schema.schemata WHERE schema_name = s.schema) ) +LIMIT 1 `; query += ' AND table_name = ' + this.quoteIdentAsLiteral(this.target.table); query += ' AND column_name = ' + this.quoteIdentAsLiteral(column);