fixes

Author: alexanderlz

redash/query_runner/memsql_ds.py

@@ -61,7 +61,8 @@ def configuration_schema(cls):
                 }
 
             },
-            "required": ["host", "port"]
+            "required": ["host", "port"],
+            "secret": ["password"]
         }
 
     @classmethod
@@ -80,25 +81,22 @@ def __init__(self, configuration):
         super(MemSQL, self).__init__(configuration)
 
     def _get_tables(self, schema):
-        try:
-            schemas_query = "show schemas"
+        schemas_query = "show schemas"
 
-            tables_query = "show tables in %s"
+        tables_query = "show tables in %s"
 
-            columns_query = "show columns in %s"
+        columns_query = "show columns in %s"
 
-            for schema_name in filter(lambda a: len(a) > 0,
-                                      map(lambda a: str(a['Database']), self._run_query_internal(schemas_query))):
-                for table_name in filter(lambda a: len(a) > 0, map(lambda a: str(a['Tables_in_%s' % schema_name]),
-                                                                   self._run_query_internal(
-                                                                           tables_query % schema_name))):
-                    table_name = '.'.join((schema_name, table_name))
-                    columns = filter(lambda a: len(a) > 0, map(lambda a: str(a['Field']),
-                                                               self._run_query_internal(columns_query % table_name)))
+        for schema_name in filter(lambda a: len(a) > 0,
+                                  map(lambda a: str(a['Database']), self._run_query_internal(schemas_query))):
+            for table_name in filter(lambda a: len(a) > 0, map(lambda a: str(a['Tables_in_%s' % schema_name]),
+                                                               self._run_query_internal(
+                                                                       tables_query % schema_name))):
+                table_name = '.'.join((schema_name, table_name))
+                columns = filter(lambda a: len(a) > 0, map(lambda a: str(a['Field']),
+                                                           self._run_query_internal(columns_query % table_name)))
 
-                    schema[table_name] = {'name': table_name, 'columns': columns}
-        except Exception, e:
-            raise sys.exc_info()[1], None, sys.exc_info()[2]
+                schema[table_name] = {'name': table_name, 'columns': columns}
         return schema.values()
 
     def run_query(self, query, user):
@@ -134,7 +132,7 @@ def run_query(self, query, user):
                     columns.append({
                         'name': column,
                         'friendly_name': column,
-                        'type': None
+                        'type': TYPE_STRING
                     })
 
             data = {'columns': columns, 'rows': rows}

requirements.txt

@@ -42,6 +42,4 @@ xlsxwriter==0.9.3
 pystache==0.5.4
 parsedatetime==2.1
 cryptography==1.4
-oauthlib==2.0.0
-WTForms==2.1
 simplejson==3.10.0