Merge pull request #238 from alison985/m10_rc

M10 rc

Author: alison985

client/app/pages/queries/query-editor.js

@@ -93,7 +93,7 @@ function queryEditor(QuerySnippet) {
             editor.focus();
           },
         };
-
+/*
         function removeExtraSchemaInfo(data) {
           let newColumns = [];
           data.forEach((table) => {
@@ -114,11 +114,11 @@ function queryEditor(QuerySnippet) {
           newColumns = []; // linter complains without this line
           return data;
         }
-
+*/
         const schemaCompleter = {
           getCompletions(state, session, pos, prefix, callback) {
             // make a variable for the auto completion in the query editor
-            $scope.autoCompleteSchema = removeExtraSchemaInfo($scope.schema);
+            $scope.autoCompleteSchema = $scope.schema; // removeExtraSchemaInfo(
 
             if (prefix.length === 0 || !$scope.autoCompleteSchema) {
               callback(null, []);
@@ -131,7 +131,16 @@ function queryEditor(QuerySnippet) {
               $scope.autoCompleteSchema.forEach((table) => {
                 keywords[table.name] = 'Table';
 
-                table.autoCompleteColumns.forEach((c) => {
+                table.columns.forEach((c) => { // autoCompleteColumns
+                  if (c.charAt(c.length - 1) === ')') {
+                    let parensStartAt = c.indexOf('(') - 1;
+                    c = c.substring(0, parensStartAt);
+                    parensStartAt = 1; // linter complains without this line
+                  }
+                  // remove '[P] ' for partition keys
+                  if (c.charAt(0) === '[') {
+                    c = c.substring(4, c.length);
+                  }
                   keywords[c] = 'Column';
                   keywords[`${table.name}.${c}`] = 'Column';
                 });

redash/query_runner/presto.py

@@ -90,6 +90,7 @@ def get_schema(self, get_stats=False):
         SELECT table_schema, table_name, column_name, data_type as column_type, extra_info
         FROM information_schema.columns
         WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
+        ORDER BY 1, 5 DESC
         """
 
         results, error = self.run_query(query, None)
@@ -107,12 +108,12 @@ def get_schema(self, get_stats=False):
 
             if row['extra_info'] == 'partition key':
                 schema[table_name]['columns'].append('[P] ' + row['column_name'] + ' (' + row['column_type'] + ')')
-            elif row['column_type'][0:3] == 'row(':
-                schema[table_name]['columns'].append(row['column_name'] + ' (row())')
-            elif row['column_type'][0:3] == 'map(':
-                schema[table_name]['columns'].append(row['column_name'] + ' (map())')
-            else:
+            elif row['column_type'] == 'integer' or row['column_type'] == 'varchar' or row['column_type'] == 'timestamp' or row['column_type'] == 'boolean' or row['column_type'] == 'bigint':
                 schema[table_name]['columns'].append(row['column_name'] + ' (' + row['column_type'] + ')')
+            elif row['column_type'][0:2] == 'row' or row['column_type'][0:2] == 'map' or row['column_type'][0:2] == 'arr':
+                schema[table_name]['columns'].append(row['column_name'] + ' (row or map or array)')
+            else:
+                schema[table_name]['columns'].append(row['column_name'])
 
         return schema.values()