From 232a404743ad007285b02838c222845ee4d39cbd Mon Sep 17 00:00:00 2001
From: Simon Willison <swillison@gmail.com>
Date: Fri, 12 Dec 2025 22:18:35 -0800
Subject: [PATCH] Switch searchable_fts test table to FTS5, closes #2613

---
 tests/fixtures.py                |  5 +--
 tests/test_api.py                | 68 ++++++++++++--------------------
 tests/test_internals_database.py |  6 +--
 3 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/tests/fixtures.py b/tests/fixtures.py
index 8d600c9b..01c501f2 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -536,9 +536,8 @@ INSERT INTO searchable_tags (searchable_id, tag) VALUES
 ;
 
 CREATE VIRTUAL TABLE "searchable_fts"
-    USING FTS4 (text1, text2, [name with . and spaces], content="searchable");
-INSERT INTO "searchable_fts" (rowid, text1, text2, [name with . and spaces])
-    SELECT rowid, text1, text2, [name with . and spaces] FROM searchable;
+    USING FTS5 (text1, text2, [name with . and spaces], content="searchable", content_rowid="pk");
+INSERT INTO "searchable_fts" (searchable_fts) VALUES ('rebuild');
 
 CREATE TABLE [select] (
   [group] text,
diff --git a/tests/test_api.py b/tests/test_api.py
index 16e1d8e6..008fc42b 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -515,22 +515,13 @@ async def test_database_page(ds_client):
             "private": False,
         },
         {
-            "columns": Either(
-                [
-                    "text1",
-                    "text2",
-                    "name with . and spaces",
-                    "searchable_fts",
-                    "docid",
-                    "__langid",
-                ],
-                # Get tests to pass on SQLite 3.25 as well
-                [
-                    "text1",
-                    "text2",
-                    "name with . and spaces",
-                ],
-            ),
+            "columns": [
+                "text1",
+                "text2",
+                "name with . and spaces",
+                "searchable_fts",
+                "rank",
+            ],
             "count": 2,
             "foreign_keys": {"incoming": [], "outgoing": []},
             "fts_table": "searchable_fts",
@@ -540,26 +531,9 @@ async def test_database_page(ds_client):
             "private": False,
         },
         {
-            "name": "searchable_fts_docsize",
-            "columns": ["docid", "size"],
-            "primary_keys": ["docid"],
-            "count": 2,
-            "hidden": True,
-            "fts_table": None,
-            "foreign_keys": {"incoming": [], "outgoing": []},
-            "private": False,
-        },
-        {
-            "name": "searchable_fts_segdir",
-            "columns": [
-                "level",
-                "idx",
-                "start_block",
-                "leaves_end_block",
-                "end_block",
-                "root",
-            ],
-            "primary_keys": ["level", "idx"],
+            "name": "searchable_fts_config",
+            "columns": ["k", "v"],
+            "primary_keys": ["k"],
             "count": 1,
             "hidden": True,
             "fts_table": None,
@@ -567,19 +541,29 @@ async def test_database_page(ds_client):
             "private": False,
         },
         {
-            "name": "searchable_fts_segments",
-            "columns": ["blockid", "block"],
-            "primary_keys": ["blockid"],
-            "count": 0,
+            "name": "searchable_fts_data",
+            "columns": ["id", "block"],
+            "primary_keys": ["id"],
+            "count": 3,
             "hidden": True,
             "fts_table": None,
             "foreign_keys": {"incoming": [], "outgoing": []},
             "private": False,
         },
         {
-            "name": "searchable_fts_stat",
-            "columns": ["id", "value"],
+            "name": "searchable_fts_docsize",
+            "columns": ["id", "sz"],
             "primary_keys": ["id"],
+            "count": 2,
+            "hidden": True,
+            "fts_table": None,
+            "foreign_keys": {"incoming": [], "outgoing": []},
+            "private": False,
+        },
+        {
+            "name": "searchable_fts_idx",
+            "columns": ["segid", "term", "pgno"],
+            "primary_keys": ["segid", "term"],
             "count": 1,
             "hidden": True,
             "fts_table": None,
diff --git a/tests/test_internals_database.py b/tests/test_internals_database.py
index 4a078f75..d2e06073 100644
--- a/tests/test_internals_database.py
+++ b/tests/test_internals_database.py
@@ -436,10 +436,10 @@ async def test_table_names(db):
         "searchable",
         "searchable_tags",
         "searchable_fts",
-        "searchable_fts_segments",
-        "searchable_fts_segdir",
+        "searchable_fts_data",
+        "searchable_fts_idx",
         "searchable_fts_docsize",
-        "searchable_fts_stat",
+        "searchable_fts_config",
         "select",
         "infinity",
         "facet_cities",