datasette-edit-schema 0.8a2__tar.gz → 0.8a5__tar.gz

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/PKG-INFO

@@ -1,25 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: datasette-edit-schema
-Version: 0.8a2
+Version: 0.8a5
 Summary: Datasette plugin for modifying table schemas
 Author: Simon Willison
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://datasette.io/plugins/datasette-edit-schema
 Project-URL: Changelog, https://github.com/simonw/datasette-edit-schema/releases
 Project-URL: Issues, https://github.com/simonw/datasette-edit-schema/issues
 Project-URL: CI, https://github.com/simonw/datasette-edit-schema/actions
 Classifier: Framework :: Datasette
-Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: datasette>=1.0a13
+Requires-Dist: datasette>=1.0a21
 Requires-Dist: sqlite-utils>=3.35
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"
 Requires-Dist: beautifulsoup4; extra == "test"
 Requires-Dist: html5lib; extra == "test"
+Dynamic: license-file
 
 # datasette-edit-schema
 
@@ -61,21 +61,15 @@ By default only [the root actor](https://datasette.readthedocs.io/en/stable/auth
 
 ## Permissions
 
-The `edit-schema` permission provides access to all functionality.
+This plugin registers an `edit-schema` action that applies to databases. Granting that action gives an actor access to every feature in the UI. Instances launched with `datasette --root` automatically allow the signed-in root actor to perform this action.
 
-You can use permission plugins such as [datasette-permissions-sql](https://github.com/simonw/datasette-permissions-sql) to grant additional access to the write interface.
+All permission checks now call `datasette.allowed()` with `DatabaseResource` or `TableResource` objects, so they work seamlessly with Datasette’s `permission_resources_sql()` hook and configuration-based permission rules. Plugins such as [datasette-permissions-sql](https://github.com/simonw/datasette-permissions-sql) can continue to be used to grant access to the write interface.
 
-These permission checks will call the `permission_allowed()` plugin hook with three arguments:
+For finer control you can combine Datasette’s built-in actions:
 
-- `action` will be the string `"edit-schema"`
-- `actor` will be the currently authenticated actor - usually a dictionary
-- `resource` will be the string name of the database
-
-You can instead use more finely-grained permissions from the default Datasette permissions collection:
-
-- `create-table` allows users to create a new table. The `resource` will be the name of the database.
-- `drop-table` allows users to drop a table. The `resource` will be a tuple of `(database_name, table_name)`.
-- `alter-table` allows users to alter a table. The `resource` will be a tuple of `(database_name, table_name)`.
+- `create-table` allows users to create a new table (database-level resource).
+- `drop-table` allows users to drop a table (table-level resource).
+- `alter-table` allows users to alter a table (table-level resource).
 
 To rename a table a user must have both `drop-table` permission for that table and `create-table` permission for that database.
 

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/README.md

@@ -38,21 +38,15 @@ By default only [the root actor](https://datasette.readthedocs.io/en/stable/auth
 
 ## Permissions
 
-The `edit-schema` permission provides access to all functionality.
+This plugin registers an `edit-schema` action that applies to databases. Granting that action gives an actor access to every feature in the UI. Instances launched with `datasette --root` automatically allow the signed-in root actor to perform this action.
 
-You can use permission plugins such as [datasette-permissions-sql](https://github.com/simonw/datasette-permissions-sql) to grant additional access to the write interface.
+All permission checks now call `datasette.allowed()` with `DatabaseResource` or `TableResource` objects, so they work seamlessly with Datasette’s `permission_resources_sql()` hook and configuration-based permission rules. Plugins such as [datasette-permissions-sql](https://github.com/simonw/datasette-permissions-sql) can continue to be used to grant access to the write interface.
 
-These permission checks will call the `permission_allowed()` plugin hook with three arguments:
+For finer control you can combine Datasette’s built-in actions:
 
-- `action` will be the string `"edit-schema"`
-- `actor` will be the currently authenticated actor - usually a dictionary
-- `resource` will be the string name of the database
-
-You can instead use more finely-grained permissions from the default Datasette permissions collection:
-
-- `create-table` allows users to create a new table. The `resource` will be the name of the database.
-- `drop-table` allows users to drop a table. The `resource` will be a tuple of `(database_name, table_name)`.
-- `alter-table` allows users to alter a table. The `resource` will be a tuple of `(database_name, table_name)`.
+- `create-table` allows users to create a new table (database-level resource).
+- `drop-table` allows users to drop a table (table-level resource).
+- `alter-table` allows users to alter a table (table-level resource).
 
 To rename a table a user must have both `drop-table` permission for that table and `create-table` permission for that database.
 
@@ -103,4 +97,4 @@ pip install -e '.[test]'
 To run the tests:
 ```bash
 pytest
-```
+```

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/datasette_edit_schema/__init__.py

@@ -1,5 +1,7 @@
 from datasette import hookimpl
 from datasette.events import CreateTableEvent, AlterTableEvent, DropTableEvent
+from datasette.permissions import Action
+from datasette.resources import DatabaseResource, TableResource
 from datasette.utils.asgi import Response, NotFound, Forbidden
 from datasette.utils import sqlite3, tilde_decode, tilde_encode
 from urllib.parse import quote_plus, unquote_plus
@@ -22,14 +24,14 @@ FOREIGN_KEY_DETECTION_LIMIT = 10_000
 
 
 @hookimpl
-def permission_allowed(actor, action, resource):
-    if (
-        action == "edit-schema"
-        and actor
-        and actor.get("id") == "root"
-        and resource != "_internal"
-    ):
-        return True
+def register_actions(datasette):
+    return [
+        Action(
+            name="edit-schema",
+            description="Edit database schemas",
+            resource_class=DatabaseResource,
+        )
+    ]
 
 
 @hookimpl
@@ -51,25 +53,36 @@ def table_actions(datasette, actor, database, table):
 
 
 async def can_create_table(datasette, actor, database):
-    if await datasette.permission_allowed(
-        actor, "edit-schema", resource=database, default=False
+    database_resource = DatabaseResource(database)
+    if await datasette.allowed(
+        actor=actor,
+        action="edit-schema",
+        resource=database_resource,
     ):
         return True
     # Or maybe they have create-table
-    if await datasette.permission_allowed(
-        actor, "create-table", resource=database, default=False
+    if await datasette.allowed(
+        actor=actor,
+        action="create-table",
+        resource=database_resource,
     ):
         return True
     return False
 
 
 async def can_alter_table(datasette, actor, database, table):
-    if await datasette.permission_allowed(
-        actor, "edit-schema", resource=database, default=False
+    database_resource = DatabaseResource(database)
+    if await datasette.allowed(
+        actor=actor,
+        action="edit-schema",
+        resource=database_resource,
     ):
         return True
-    if await datasette.permission_allowed(
-        actor, "alter-table", resource=(database, table), default=False
+    table_resource = TableResource(database, table)
+    if await datasette.allowed(
+        actor=actor,
+        action="alter-table",
+        resource=table_resource,
     ):
         return True
     return False
@@ -84,13 +97,19 @@ async def can_rename_table(datasette, actor, database, table):
 
 
 async def can_drop_table(datasette, actor, database, table):
-    if await datasette.permission_allowed(
-        actor, "edit-schema", resource=database, default=False
+    database_resource = DatabaseResource(database)
+    if await datasette.allowed(
+        actor=actor,
+        action="edit-schema",
+        resource=database_resource,
     ):
         return True
     # Or maybe they have drop-table
-    if await datasette.permission_allowed(
-        actor, "drop-table", resource=(database, table), default=False
+    table_resource = TableResource(database, table)
+    if await datasette.allowed(
+        actor=actor,
+        action="drop-table",
+        resource=table_resource,
     ):
         return True
     return False
@@ -148,8 +167,10 @@ def get_databases(datasette):
 
 
 async def check_permissions(datasette, request, database):
-    if not await datasette.permission_allowed(
-        request.actor, "edit-schema", resource=database, default=False
+    if not await datasette.allowed(
+        actor=request.actor,
+        action="edit-schema",
+        resource=DatabaseResource(database),
     ):
         raise Forbidden("Permission denied for edit-schema")
 
@@ -160,8 +181,10 @@ async def edit_schema_index(datasette, request):
     allowed_databases = [
         name
         for name in database_names
-        if await datasette.permission_allowed(
-            request.actor, "edit-schema", resource=name, default=False
+        if await datasette.allowed(
+            actor=request.actor,
+            action="edit-schema",
+            resource=DatabaseResource(name),
         )
     ]
     if not allowed_databases:

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/datasette_edit_schema/templates/edit_schema_table.html

@@ -14,13 +14,14 @@ html body input[type="search"] {
     font-size: 1em;
     font-family: Helvetica, sans-serif;
 }
-body form .button-red {
-    background-color: red;
-    border-color: red;
-}
-body form .button-small {
+input[type=submit].button-small {
     font-size: 0.7em;
 }
+form input[type=submit].button-red {
+    background: red;
+    border-color: rgb(171, 112, 112);
+}
+
 select {
     border: 1px solid #ccc;
     border-radius: 3px;
@@ -91,7 +92,7 @@ html body label {
 {% if can_rename_table %}
 <h2>Rename table</h2>
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+<form class="core" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
     <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
     <p><label>New name&nbsp; <input type="text" name="name"></label>
     <input type="hidden" name="rename_table" value="1">
@@ -99,7 +100,7 @@ html body label {
 </form>
 {% endif %}
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+<form class="core" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
 <h2>Change existing columns</h2>
 <ul class="sortable-columns">
 {% for column in columns %}
@@ -134,7 +135,7 @@ html body label {
 
 <h2>Add a column</h2>
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+<form class="core" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
     <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
     <input type="hidden" name="add_column" value="1">
     <p><label>Name &nbsp;<input type="text" name="name"></label>
@@ -156,7 +157,7 @@ table.foreign-key-options td {
 }
 </style>
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+<form class="core" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
     <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
     <input type="hidden" name="action" value="update_foreign_keys">
     <table class="foreign-key-options">
@@ -180,7 +181,7 @@ table.foreign-key-options td {
 
     <p>The primary key column uniquely identifies each row in the table.</p>
 
-    <form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+    <form class="core" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
         <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
         <input type="hidden" name="action" value="update_primary_key">
         <label for="primary_key">Primary key column &nbsp;</label>
@@ -201,7 +202,7 @@ table.foreign-key-options td {
 
     <p>Indexes can speed up filter and sort operations against indexed columns.</p>
 
-    <form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+    <form class="core" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
         <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
         {% if non_primary_key_columns %}
             <p><label for="id_add_index_column">
@@ -233,7 +234,7 @@ table.foreign-key-options td {
 {% if can_drop_table %}
     <h2>Drop table</h2>
 
-    <form id="drop-table-form" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
+    <form class="core" id="drop-table-form" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
         <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
         <input type="hidden" name="drop_table" value="1">
         <input type="submit" class="button-red" value="Drop this table">

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/datasette_edit_schema.egg-info/PKG-INFO

@@ -1,25 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: datasette-edit-schema
-Version: 0.8a2
+Version: 0.8a5
 Summary: Datasette plugin for modifying table schemas
 Author: Simon Willison
-License: Apache-2.0
+License-Expression: Apache-2.0
 Project-URL: Homepage, https://datasette.io/plugins/datasette-edit-schema
 Project-URL: Changelog, https://github.com/simonw/datasette-edit-schema/releases
 Project-URL: Issues, https://github.com/simonw/datasette-edit-schema/issues
 Project-URL: CI, https://github.com/simonw/datasette-edit-schema/actions
 Classifier: Framework :: Datasette
-Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: datasette>=1.0a13
+Requires-Dist: datasette>=1.0a21
 Requires-Dist: sqlite-utils>=3.35
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"
 Requires-Dist: beautifulsoup4; extra == "test"
 Requires-Dist: html5lib; extra == "test"
+Dynamic: license-file
 
 # datasette-edit-schema
 
@@ -61,21 +61,15 @@ By default only [the root actor](https://datasette.readthedocs.io/en/stable/auth
 
 ## Permissions
 
-The `edit-schema` permission provides access to all functionality.
+This plugin registers an `edit-schema` action that applies to databases. Granting that action gives an actor access to every feature in the UI. Instances launched with `datasette --root` automatically allow the signed-in root actor to perform this action.
 
-You can use permission plugins such as [datasette-permissions-sql](https://github.com/simonw/datasette-permissions-sql) to grant additional access to the write interface.
+All permission checks now call `datasette.allowed()` with `DatabaseResource` or `TableResource` objects, so they work seamlessly with Datasette’s `permission_resources_sql()` hook and configuration-based permission rules. Plugins such as [datasette-permissions-sql](https://github.com/simonw/datasette-permissions-sql) can continue to be used to grant access to the write interface.
 
-These permission checks will call the `permission_allowed()` plugin hook with three arguments:
+For finer control you can combine Datasette’s built-in actions:
 
-- `action` will be the string `"edit-schema"`
-- `actor` will be the currently authenticated actor - usually a dictionary
-- `resource` will be the string name of the database
-
-You can instead use more finely-grained permissions from the default Datasette permissions collection:
-
-- `create-table` allows users to create a new table. The `resource` will be the name of the database.
-- `drop-table` allows users to drop a table. The `resource` will be a tuple of `(database_name, table_name)`.
-- `alter-table` allows users to alter a table. The `resource` will be a tuple of `(database_name, table_name)`.
+- `create-table` allows users to create a new table (database-level resource).
+- `drop-table` allows users to drop a table (table-level resource).
+- `alter-table` allows users to alter a table (table-level resource).
 
 To rename a table a user must have both `drop-table` permission for that table and `create-table` permission for that database.
 

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/datasette_edit_schema.egg-info/requires.txt

@@ -1,4 +1,4 @@
-datasette>=1.0a13
+datasette>=1.0a21
 sqlite-utils>=3.35
 
 [test]

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/pyproject.toml

@@ -1,17 +1,16 @@
 [project]
 name = "datasette-edit-schema"
-version = "0.8a2"
+version = "0.8a5"
 description = "Datasette plugin for modifying table schemas"
 readme = "README.md"
 authors = [{name = "Simon Willison"}]
-license = {text = "Apache-2.0"}
+license = "Apache-2.0"
 classifiers=[
-    "Framework :: Datasette",
-    "License :: OSI Approved :: Apache Software License"
+    "Framework :: Datasette"
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dependencies = [
-    "datasette>=1.0a13",
+    "datasette>=1.0a21",
     "sqlite-utils>=3.35",
 ]
 

{datasette_edit_schema-0.8a2 → datasette_edit_schema-0.8a5}/tests/test_edit_schema.py

@@ -22,9 +22,15 @@ def get_last_event(datasette):
         return events[-1]
 
 
+def root_datasette(*args, **kwargs):
+    ds = Datasette(*args, **kwargs)
+    ds.root_enabled = True
+    return ds
+
+
 @pytest.mark.asyncio
 async def test_csrf_required(db_path):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     response = await ds.client.post(
         "/edit-schema/data/creatures",
         data={"drop_table": "1"},
@@ -78,7 +84,7 @@ async def test_table_actions(permission_plugin, ds, actor_id, should_allow, tabl
 
 @pytest.mark.asyncio
 async def test_post_without_operation_raises_error(db_path):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     # Get a csrftoken
     csrftoken = (
@@ -104,7 +110,7 @@ async def test_post_without_operation_raises_error(db_path):
     ),
 )
 async def test_drop_table(permission_plugin, db_path, actor_id, should_allow):
-    ds = Datasette([db_path], pdb=True)
+    ds = root_datasette([db_path], pdb=True)
     ds._rules_allow = [
         Rule(
             actor_id="user_with_edit_schema",
@@ -174,7 +180,7 @@ async def test_drop_table(permission_plugin, db_path, actor_id, should_allow):
     [("text", str), ("integer", int), ("real", float), ("blob", bytes)],
 )
 async def test_add_column(db_path, col_type, expected_type):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     db = sqlite_utils.Database(db_path)
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     table = db["creatures"]
@@ -218,7 +224,7 @@ async def test_add_column(db_path, col_type, expected_type):
     ],
 )
 async def test_add_column_errors(db_path, name, type, expected_error):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     csrftoken = (
         await ds.client.get("/-/edit-schema/data/creatures", cookies=cookies)
@@ -345,7 +351,7 @@ async def test_add_column_errors(db_path, name, type, expected_error):
 async def test_transform_table(
     db_path, action, post_data, expected_columns_dict, expected_order, expected_message
 ):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     db = sqlite_utils.Database(db_path)
     table = db["creatures"]
@@ -378,7 +384,7 @@ async def test_transform_table(
 @pytest.mark.asyncio
 async def test_drop_column_from_table_that_is_part_of_a_view(db_path):
     # https://github.com/simonw/datasette-edit-schema/issues/35
-    ds = Datasette([db_path], pdb=True)
+    ds = root_datasette([db_path], pdb=True)
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     db = sqlite_utils.Database(db_path)
     db.create_view("creatures_view", "select * from creatures")
@@ -407,7 +413,7 @@ async def test_drop_column_from_table_that_is_part_of_a_view(db_path):
 
 @pytest.mark.asyncio
 async def test_static_assets(db_path):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     for path in (
         "/-/static-plugins/datasette-edit-schema/draggable.1.0.0-beta.11.bundle.min.js",
     ):
@@ -421,7 +427,7 @@ async def test_static_assets(db_path):
 )
 async def test_permission_edit_schema(db_path, path):
     # root user has edit-schema which allows access to all
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     someuser_cookies = {"ds_actor": ds.sign({"a": {"id": "someuser"}}, "actor")}
     root_cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     response = await ds.client.get(path)
@@ -615,7 +621,7 @@ async def test_table_form_contains_schema(permission_plugin, ds):
     ],
 )
 async def test_rename_table(db_path, new_name, should_work, expected_message):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     csrftoken = (
         await ds.client.get("/-/edit-schema/data/creatures", cookies=cookies)
@@ -674,7 +680,7 @@ async def test_rename_table(db_path, new_name, should_work, expected_message):
     ),
 )
 async def test_breadcrumbs(db_path, path, expected_breadcrumbs):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     response = await ds.client.get(path, cookies=cookies)
     assert response.status_code == 200
@@ -696,7 +702,7 @@ def test_potential_foreign_keys(db):
 @pytest.mark.asyncio
 async def test_edit_form_shows_suggestions(db_path):
     # Test for suggested foreign keys and primary keys
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     response = await ds.client.get("/-/edit-schema/data/museums", cookies=cookies)
     assert response.status_code == 200
@@ -767,7 +773,7 @@ async def test_edit_form_shows_suggestions(db_path):
 @pytest.mark.asyncio
 async def test_edit_form_for_empty_table(db_path):
     # https://github.com/simonw/datasette-edit-schema/issues/38
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     response = await ds.client.get("/-/edit-schema/data/empty_table", cookies=cookies)
     assert response.status_code == 200
@@ -859,7 +865,7 @@ async def test_edit_form_for_empty_table(db_path):
 async def test_edit_keys(
     db_path, table, post_data, expected_fks, expected_pk, expected_message
 ):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     # Grab a csrftoken
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     csrftoken_r = await ds.client.get(
@@ -951,7 +957,7 @@ def get_options(soup, name):
     ),
 )
 async def test_create_table(db_path, post_data, expected_message, expected_schema):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     csrftoken_r = await ds.client.get("/-/edit-schema/data/-/create", cookies=cookies)
     csrftoken = csrftoken_r.cookies["ds_csrftoken"]
@@ -1107,7 +1113,7 @@ def test_potential_primary_keys_primary_key_only_table():
 async def test_add_remove_index(
     db_path, table, post_data, expected_message, expected_indexes
 ):
-    ds = Datasette([db_path])
+    ds = root_datasette([db_path])
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     get_response = await ds.client.get(
         "/-/edit-schema/data/{}".format(tilde_encode(table)), cookies=cookies
@@ -1144,7 +1150,7 @@ async def test_database_and_table_level_permissions(tmp_path):
     sales_db["notes"].insert({"id": 1, "note": "Hello"}, pk="id")
     sales_db["not_allowed"].insert({"id": 1}, pk="id")
 
-    ds = Datasette(
+    ds = root_datasette(
         [marketing_path, sales_path],
         config={
             "databases": {