Use FTS4 in fixtures

Closes #1081

tests/fixtures.py

@@ -488,7 +488,7 @@ INSERT INTO searchable_tags (searchable_id, tag) VALUES
 ;
 
 CREATE VIRTUAL TABLE "searchable_fts"
-    USING FTS3 (text1, text2, [name with . and spaces], content="searchable");
+    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;
 

tests/test_api.py

@@ -37,9 +37,9 @@ def test_homepage(app_client):
     assert len(d["tables_and_views_truncated"]) == 5
     assert d["tables_and_views_more"] is True
     # 4 hidden FTS tables + no_primary_key (hidden in metadata)
-    assert d["hidden_tables_count"] == 5
+    assert d["hidden_tables_count"] == 6
-    # 201 in no_primary_key, plus 5 in other hidden tables:
+    # 201 in no_primary_key, plus 6 in other hidden tables:
-    assert d["hidden_table_rows_sum"] == 206
+    assert d["hidden_table_rows_sum"] == 207
     assert d["views_count"] == 4
 
 
@@ -512,7 +512,7 @@ def test_database_page(app_client):
         },
         {
             "name": "searchable_fts",
-            "columns": ["text1", "text2", "name with . and spaces", "content"],
+            "columns": ["text1", "text2", "name with . and spaces"],
             "primary_keys": [],
             "count": 2,
             "hidden": True,
@@ -521,14 +521,8 @@ def test_database_page(app_client):
             "private": False,
         },
         {
-            "name": "searchable_fts_content",
+            "name": "searchable_fts_docsize",
-            "columns": [
+            "columns": ["docid", "size"],
-                "docid",
-                "c0text1",
-                "c1text2",
-                "c2name with . and spaces",
-                "c3content",
-            ],
             "primary_keys": ["docid"],
             "count": 2,
             "hidden": True,
@@ -563,6 +557,16 @@ def test_database_page(app_client):
             "foreign_keys": {"incoming": [], "outgoing": []},
             "private": False,
         },
+        {
+            "name": "searchable_fts_stat",
+            "columns": ["id", "value"],
+            "primary_keys": ["id"],
+            "count": 1,
+            "hidden": True,
+            "fts_table": None,
+            "foreign_keys": {"incoming": [], "outgoing": []},
+            "private": False,
+        },
     ]
 
 

tests/test_internals_database.py

@@ -297,7 +297,7 @@ async def test_get_all_foreign_keys(db):
 @pytest.mark.asyncio
 async def test_table_names(db):
     table_names = await db.table_names()
-    assert [
+    assert table_names == [
         "simple_primary_key",
         "primary_key_multiple_columns",
         "primary_key_multiple_columns_explicit_label",
@@ -316,9 +316,10 @@ async def test_table_names(db):
         "searchable",
         "searchable_tags",
         "searchable_fts",
-        "searchable_fts_content",
         "searchable_fts_segments",
         "searchable_fts_segdir",
+        "searchable_fts_docsize",
+        "searchable_fts_stat",
         "select",
         "infinity",
         "facet_cities",
@@ -327,7 +328,7 @@ async def test_table_names(db):
         "roadside_attractions",
         "attraction_characteristic",
         "roadside_attraction_characteristics",
-    ] == table_names
+    ]
 
 
 @pytest.mark.asyncio