From e48f7f1bfea3f23e5d2289f8aa7b1d1188825974 Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Wed, 9 Dec 2020 11:56:44 -0800
Subject: [PATCH] Fix for combining ?_search_x and ?_searchmode=raw, closes
 #1134

---
 datasette/views/table.py | 4 +++-
 tests/test_api.py        | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/datasette/views/table.py b/datasette/views/table.py
index a0de2a8e..3e9adf88 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -443,7 +443,9 @@ class TableView(RowTableShared):
         fts_table = fts_table or await db.fts_table(table)
         fts_pk = special_args.get("_fts_pk", table_metadata.get("fts_pk", "rowid"))
         search_args = dict(
-            pair for pair in special_args.items() if pair[0].startswith("_search")
+            pair
+            for pair in special_args.items()
+            if pair[0].startswith("_search") and pair[0] != "_searchmode"
         )
         search = ""
         search_mode_raw = special_args.get("_searchmode") == "raw"
diff --git a/tests/test_api.py b/tests/test_api.py
index 4339507c..f36aac0d 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1035,6 +1035,13 @@ def test_sortable_columns_metadata(app_client):
                 [2, "terry dog", "sara weasel", "puma"],
             ],
         ),
+        (
+            # _searchmode=raw combined with _search_COLUMN
+            "/fixtures/searchable.json?_search_text2=te*&_searchmode=raw",
+            [
+                [1, "barry cat", "terry dog", "panther"],
+            ],
+        ),
         (
             "/fixtures/searchable.json?_search=weasel",
             [[2, "terry dog", "sara weasel", "puma"]],