From 8ce7e113d995f979f3c90bd1a877570acfa7c46d Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Fri, 19 Oct 2018 15:05:49 +0200
Subject: [PATCH] adjust meta data queries for mysql

---
 public/app/plugins/datasource/mysql/meta_query.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/mysql/meta_query.ts b/public/app/plugins/datasource/mysql/meta_query.ts
index 21fe490df43..32830d20aee 100644
--- a/public/app/plugins/datasource/mysql/meta_query.ts
+++ b/public/app/plugins/datasource/mysql/meta_query.ts
@@ -79,14 +79,14 @@ export class MysqlMetaQuery {
       query += ' AND table_name = ' + this.quoteIdentAsLiteral(parts[1]);
       return query;
     } else {
-      query = ' table_name = ' + this.quoteIdentAsLiteral(table);
+      query = 'table_schema = database() AND table_name = ' + this.quoteIdentAsLiteral(table);
 
       return query;
     }
   }
 
   buildTableQuery() {
-    return "SELECT table_name FROM information_schema.tables WHERE table_schema <> 'information_schema' ORDER BY table_name";
+    return 'SELECT table_name FROM information_schema.tables WHERE table_schema = database() ORDER BY table_name';
   }
 
   buildColumnQuery(type?: string) {
@@ -95,7 +95,7 @@ export class MysqlMetaQuery {
 
     switch (type) {
       case 'time': {
-        query += " AND data_type IN ('timestamp','datetime','bigint','int','float')";
+        query += " AND data_type IN ('timestamp','datetime','bigint','int','double','float')";
         break;
       }
       case 'metric': {
@@ -103,8 +103,7 @@ export class MysqlMetaQuery {
         break;
       }
       case 'value': {
-        query +=
-          " AND data_type IN ('bigint','int','float','smallint', 'mediumint', 'tinyint', 'double', 'decimal', 'float')";
+        query += " AND data_type IN ('bigint','int','smallint','mediumint','tinyint','double','decimal','float')";
         query += ' AND column_name <> ' + this.quoteIdentAsLiteral(this.target.timeColumn);
         break;
       }