Add column type info to query runners (re #152, #23)

Also: Fix bug 1529388 - don't include column type in autocomplete results. (#832)
mozilla · Mar 26, 2019 · 5b7f4eb · 5b7f4eb
1 parent f8fd885
commit 5b7f4eb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/client/app/components/keywordBuilder.js b/client/app/components/keywordBuilder.js
@@ -29,6 +29,9 @@ function buildKeywordsFromSchema(schema) {
     });
     tableColumnKeywords[table.name] = buildTableColumnKeywords(table);
     table.columns.forEach((c) => {
+      if (c.length > 0) {
+        c = c.split('(')[0];
+      }
       columnKeywords[c] = 'Column';
     });
   });

diff --git a/client/app/components/queries/schema-browser.js b/client/app/components/queries/schema-browser.js
@@ -35,7 +35,7 @@ function SchemaBrowserCtrl($rootScope, $scope) {
   };
 
   this.itemSelected = ($event, hierarchy) => {
-    $rootScope.$broadcast('query-editor.command', 'paste', hierarchy.join('.'));
+    $rootScope.$broadcast('query-editor.command', 'paste', hierarchy.join('.').split('(')[0]);
     $event.preventDefault();
     $event.stopPropagation();
   };

diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
@@ -149,7 +149,7 @@ def get_schema(self, get_stats=False):
 
         schema = {}
         query = """
-        SELECT table_schema, table_name, column_name
+        SELECT table_schema, table_name, column_name, data_type as column_type
         FROM information_schema.columns
         WHERE table_schema NOT IN ('information_schema')
         """
@@ -163,7 +163,7 @@ def get_schema(self, get_stats=False):
             table_name = '{0}.{1}'.format(row['table_schema'], row['table_name'])
             if table_name not in schema:
                 schema[table_name] = {'name': table_name, 'columns': []}
-            schema[table_name]['columns'].append(row['column_name'])
+            schema[table_name]['columns'].append(row['column_name'] + ' (' + row['column_type'] + ')')
 
         return schema.values()
 

diff --git a/redash/query_runner/mysql.py b/redash/query_runner/mysql.py
@@ -106,7 +106,8 @@ def _get_tables(self, schema):
         query = """
         SELECT col.table_schema as table_schema,
                col.table_name as table_name,
-               col.column_name as column_name
+               col.column_name as column_name,
+               col.column_type as column_type
         FROM `information_schema`.`columns` col
         WHERE col.table_schema NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys');
         """
@@ -127,7 +128,7 @@ def _get_tables(self, schema):
             if table_name not in schema:
                 schema[table_name] = {'name': table_name, 'columns': []}
 
-            schema[table_name]['columns'].append(row['column_name'])
+            schema[table_name]['columns'].append(row['column_name'] + ' (' + row['column_type'] + ')')
 
         return schema.values()
 

diff --git a/redash/query_runner/pg.py b/redash/query_runner/pg.py
@@ -129,7 +129,7 @@ def _get_definitions(self, schema, query):
             if table_name not in schema:
                 schema[table_name] = {'name': table_name, 'columns': []}
 
-            schema[table_name]['columns'].append(row['column_name'])
+            schema[table_name]['columns'].append(row['column_name'] + ' (' + row['column_type'] + ')')
 
     def _get_tables(self, schema):
         '''
@@ -149,6 +149,7 @@ def _get_tables(self, schema):
         query = """
         SELECT s.nspname as table_schema,
                c.relname as table_name,
+               t.typname as column_type,
                a.attname as column_name
         FROM pg_class c
         JOIN pg_namespace s
@@ -158,6 +159,8 @@ def _get_tables(self, schema):
         ON a.attrelid = c.oid
         AND a.attnum > 0
         AND NOT a.attisdropped
+        JOIN pg_type t
+        ON a.atttypid = t.oid
         WHERE c.relkind IN ('r', 'v', 'm', 'f', 'p')
         """
 

diff --git a/redash/query_runner/presto.py b/redash/query_runner/presto.py
@@ -78,7 +78,7 @@ def type(cls):
     def get_schema(self, get_stats=False):
         schema = {}
         query = """
-        SELECT table_schema, table_name, column_name
+        SELECT table_schema, table_name, column_name, data_type as column_type
         FROM information_schema.columns
         WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
         """
@@ -96,7 +96,7 @@ def get_schema(self, get_stats=False):
             if table_name not in schema:
                 schema[table_name] = {'name': table_name, 'columns': []}
 
-            schema[table_name]['columns'].append(row['column_name'])
+            schema[table_name]['columns'].append(row['column_name'] + ' (' + row['column_type'] + ')')
 
         return schema.values()