From 8bde6c54615af529e81de559cbb3bf3ee5fe17cb Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Tue, 1 Jun 2021 08:55:28 -0700
Subject: [PATCH] Rename ?_nofacets=1 to ?_nofacet=1, refs #1353

---
 datasette/views/base.py  |  6 +++---
 datasette/views/table.py |  4 ++--
 docs/json_api.rst        |  2 +-
 tests/test_api.py        | 10 +++++-----
 tests/test_csv.py        |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/datasette/views/base.py b/datasette/views/base.py
index aefaec6c9a..b8c581fc3a 100644
--- a/datasette/views/base.py
+++ b/datasette/views/base.py
@@ -264,11 +264,11 @@ async def get(self, request, db_name, **kwargs):
     async def as_csv(self, request, database, hash, **kwargs):
         stream = request.args.get("_stream")
         # Do not calculate facets:
-        if not request.args.get("_nofacets"):
+        if not request.args.get("_nofacet"):
             if not request.query_string:
-                new_query_string = "_nofacets=1"
+                new_query_string = "_nofacet=1"
             else:
-                new_query_string = request.query_string + "&_nofacets=1"
+                new_query_string = request.query_string + "&_nofacet=1"
             new_scope = dict(
                 request.scope, query_string=new_query_string.encode("latin-1")
             )
diff --git a/datasette/views/table.py b/datasette/views/table.py
index 83c2b922a5..7fbf670b43 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -731,7 +731,7 @@ async def data(
                 )
             )
 
-        if not request.args.get("_nofacets"):
+        if not request.args.get("_nofacet"):
             for facet in facet_instances:
                 (
                     instance_facet_results,
@@ -829,7 +829,7 @@ async def data(
             self.ds.setting("suggest_facets")
             and self.ds.setting("allow_facet")
             and not _next
-            and not request.args.get("_nofacets")
+            and not request.args.get("_nofacet")
         ):
             for facet in facet_instances:
                 suggested_facets.extend(await facet.suggest())
diff --git a/docs/json_api.rst b/docs/json_api.rst
index 62c208a287..f1c347b753 100644
--- a/docs/json_api.rst
+++ b/docs/json_api.rst
@@ -383,7 +383,7 @@ Special table arguments
 ``?_facet_size=100``
     Increase the number of facet results returned for each facet. Use ``?_facet_size=max`` for the maximum available size, determined by :ref:`setting_max_returned_rows`.
 
-``?_nofacets=1``
+``?_nofacet=1``
     Disable all facets and facet suggestions for this page, including any defined by :ref:`facets_metadata`.
 
 ``?_trace=1``
diff --git a/tests/test_api.py b/tests/test_api.py
index 3d6d03305c..5e63913341 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1669,13 +1669,13 @@ def test_suggest_facets_off():
         assert [] == client.get("/fixtures/facetable.json").json["suggested_facets"]
 
 
-@pytest.mark.parametrize("nofacets", (True, False))
-def test_nofacets(app_client, nofacets):
+@pytest.mark.parametrize("nofacet", (True, False))
+def test_nofacet(app_client, nofacet):
     path = "/fixtures/facetable.json?_facet=state"
-    if nofacets:
-        path += "&_nofacets=1"
+    if nofacet:
+        path += "&_nofacet=1"
     response = app_client.get(path)
-    if nofacets:
+    if nofacet:
         assert response.json["suggested_facets"] == []
         assert response.json["facet_results"] == {}
     else:
diff --git a/tests/test_csv.py b/tests/test_csv.py
index 30afbd9ed1..40549fd857 100644
--- a/tests/test_csv.py
+++ b/tests/test_csv.py
@@ -105,8 +105,8 @@ def test_custom_sql_csv_blob_columns(app_client):
     assert "text/plain; charset=utf-8" == response.headers["content-type"]
     assert response.text == (
         "rowid,data\r\n"
-        '1,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacets=1&_blob_column=data&_blob_hash=f3088978da8f9aea479ffc7f631370b968d2e855eeb172bea7f6c7a04262bb6d"\r\n'
-        '2,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacets=1&_blob_column=data&_blob_hash=b835b0483cedb86130b9a2c280880bf5fadc5318ddf8c18d0df5204d40df1724"\r\n'
+        '1,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacet=1&_blob_column=data&_blob_hash=f3088978da8f9aea479ffc7f631370b968d2e855eeb172bea7f6c7a04262bb6d"\r\n'
+        '2,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_nofacet=1&_blob_column=data&_blob_hash=b835b0483cedb86130b9a2c280880bf5fadc5318ddf8c18d0df5204d40df1724"\r\n'
         "3,\r\n"
     )