From 5aa359b86907d11b3ee601510775a85a90224da8 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 6 Sep 2022 16:58:30 -0700
Subject: [PATCH] Apply cell truncation on query page too, refs #1805

---
 datasette/views/database.py |  7 ++++++-
 tests/test_html.py          | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/datasette/views/database.py b/datasette/views/database.py
index fc344245..affbc540 100644
--- a/datasette/views/database.py
+++ b/datasette/views/database.py
@@ -428,7 +428,12 @@ class QueryView(DataView):
                                     "" if len(value) == 1 else "s",
                                 )
                             )
-
+                        else:
+                            display_value = str(value)
+                            if truncate_cells and len(display_value) > truncate_cells:
+                                display_value = (
+                                    display_value[:truncate_cells] + "\u2026"
+                                )
                     display_row.append(display_value)
                 display_rows.append(display_row)
 
diff --git a/tests/test_html.py b/tests/test_html.py
index d6e969ad..bf915247 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -186,6 +186,25 @@ def test_row_page_does_not_truncate():
         ]
 
 
+def test_query_page_truncates():
+    with make_app_client(settings={"truncate_cells_html": 5}) as client:
+        response = client.get(
+            "/fixtures?"
+            + urllib.parse.urlencode(
+                {
+                    "sql": "select 'this is longer than 5' as a, 'https://example.com/' as b"
+                }
+            )
+        )
+        assert response.status == 200
+        table = Soup(response.body, "html.parser").find("table")
+        tds = table.findAll("td")
+        assert [str(td) for td in tds] == [
+            '<td class="col-a">this …</td>',
+            '<td class="col-b"><a href="https://example.com/">http…</a></td>',
+        ]
+
+
 @pytest.mark.parametrize(
     "path,expected_classes",
     [