Merge pull request #2691 from getredash/small-07-2018

Fix the recent queries API endpoint.
getredash · Jul 25, 2018 · 2c3067b · 2c3067b
2 parents a05c4b3 + 2e9ef66
commit 2c3067b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/redash/handlers/queries.py b/redash/handlers/queries.py
@@ -60,13 +60,13 @@ class QueryRecentResource(BaseResource):
     @require_permission('view_query')
     def get(self):
         """
-        Retrieve up to 10 queries modified in the last 7 days.
+        Retrieve up to 10 queries recently modified by the user.
 
         Responds with a list of :ref:`query <query-response-label>` objects.
         """
 
         results = models.Query.by_user(self.current_user).order_by(models.Query.updated_at.desc()).limit(10)
-        return QuerySerializer(results, with_last_modified_by=False, with_user=False)
+        return QuerySerializer(results, with_last_modified_by=False, with_user=False).serialize()
 
 
 class QueryListResource(BaseResource):

diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py
@@ -53,7 +53,9 @@ def _value_eval_list(row_values, col_types):
     raw_values = zip(col_types, row_values)
     for typ, rval in raw_values:
         try:
-            if typ == TYPE_BOOLEAN:
+            if rval is None or rval == '':
+                val = None
+            elif typ == TYPE_BOOLEAN:
                 val = True if unicode(rval).lower() == 'true' else False
             elif typ == TYPE_DATETIME:
                 val = parser.parse(rval)

diff --git a/tests/query_runner/test_google_spreadsheets.py b/tests/query_runner/test_google_spreadsheets.py
@@ -48,17 +48,17 @@ def test_handles_boolean(self):
     def test_handles_empty_values(self):
         values = ['', None]
         converted_values = [None, None]
-        self.assertEqual(converted_values, _value_eval_list(values))
+        self.assertEqual(converted_values, _value_eval_list(values, [TYPE_STRING, TYPE_STRING]))
 
     def test_handles_float(self):
         values = ['3.14', '-273.15']
         converted_values = [3.14, -273.15]
-        self.assertEqual(converted_values, _value_eval_list(values))
+        self.assertEqual(converted_values, _value_eval_list(values, [TYPE_FLOAT, TYPE_FLOAT]))
 
     def test_handles_datetime(self):
         values = ['2018-06-28', '2020-2-29']
         converted_values = [datetime.datetime(2018, 6, 28, 0, 0), datetime.datetime(2020, 2, 29, 0, 0)]
-        self.assertEqual(converted_values, _value_eval_list(values))
+        self.assertEqual(converted_values, _value_eval_list(values, [TYPE_DATETIME, TYPE_DATETIME]))
 
 
 class TestParseSpreadsheet(TestCase):