Fix error if array contains datetimes, closes #146

simonw · Mar 8, 2022 · 3f96cf7 · 3f96cf7
1 parent ea3c2be
commit 3f96cf7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/django_sql_dashboard/utils.py b/django_sql_dashboard/utils.py
@@ -52,7 +52,7 @@ def displayable_rows(rows):
         fixed_row = []
         for cell in row:
             if isinstance(cell, (dict, list)):
-                cell = json.dumps(cell)
+                cell = json.dumps(cell, default=str)
             fixed_row.append(cell)
         fixed.append(fixed_row)
     return fixed

diff --git a/test_project/test_dashboard.py b/test_project/test_dashboard.py
@@ -127,7 +127,15 @@ def test_dashboard_sql_errors(admin_client, sql, expected_error):
 
 @pytest.mark.parametrize(
     "sql,expected_columns,expected_rows",
-    (("select 'abc' as one, 'bcd' as one", ["one", "one"], [["abc", "bcd"]]),),
+    (
+        ("select 'abc' as one, 'bcd' as one", ["one", "one"], [["abc", "bcd"]]),
+        ("select ARRAY[1, 2, 3]", ["array"], [["[\n  1,\n  2,\n  3\n]"]]),
+        (
+            "select ARRAY[TIMESTAMP WITH TIME ZONE '2004-10-19 10:23:54+02']",
+            ["array"],
+            [['[\n  "2004-10-19 08:23:54+00:00"\n]']],
+        ),
+    ),
 )
 def test_dashboard_sql_queries(admin_client, sql, expected_columns, expected_rows):
     response = admin_client.post("/dashboard/", {"sql": sql}, follow=True)