Use execute_isolated_fn() if available, closes #47

simonw · Feb 9, 2024 · e510ce3 · e510ce3
1 parent 85bcdb4
commit e510ce3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/datasette_edit_schema/__init__.py b/datasette_edit_schema/__init__.py
@@ -600,7 +600,13 @@ def do_drop_table(conn):
         db[table].drop()
         db.vacuum()
 
-    await datasette.databases[database.name].execute_write_fn(do_drop_table, block=True)
+    if hasattr(database, "execute_isolated_fn"):
+        await database.execute_isolated_fn(do_drop_table)
+        # For the tests
+        datasette._datasette_edit_schema_used_execute_isolated_fn = True
+    else:
+        await database.execute_write_fn(do_drop_table)
+
     datasette.add_message(request, "Table has been deleted")
     await track_event(
         datasette,

diff --git a/tests/test_edit_schema.py b/tests/test_edit_schema.py
@@ -173,6 +173,8 @@ async def test_drop_table(permission_plugin, db_path, actor_id, should_allow):
         event = get_last_event(ds)
         if event is not None:
             assert event.name == "drop-table"
+            # This should have used isolated_fn as well:
+            assert getattr(ds, "_datasette_edit_schema_used_execute_isolated_fn", None)
     else:
         assert response.status_code == 403
         assert "creatures" in db.table_names()