table_config instead of table_metadata

datasette/app.py

@@ -347,9 +347,9 @@ def __init__(
         # Move any "plugins" settings from metadata to config - updates them in place
         metadata = metadata or {}
         config = config or {}
-        move_plugins(metadata, config)
+        metadata, config = move_plugins(metadata, config)
         # Now migrate any known table configuration settings over as well
-        move_table_config(metadata, config)
+        metadata, config = move_table_config(metadata, config)
 
         self._metadata_local = metadata or {}
         self.sqlite_extensions = []

datasette/utils/__init__.py

@@ -2,6 +2,7 @@
 from contextlib import contextmanager
 import click
 from collections import OrderedDict, namedtuple, Counter
+import copy
 import base64
 import hashlib
 import inspect
@@ -17,7 +18,7 @@
 import types
 import secrets
 import shutil
-from typing import Iterable
+from typing import Iterable, Tuple
 import urllib
 import yaml
 from .shutil_backport import copytree
@@ -1301,11 +1302,13 @@
                 d.pop(key, None)
 
 
-def move_plugins(source: dict, destination: dict):
+def move_plugins(source: dict, destination: dict) -> Tuple[dict, dict]:
     """
     Move 'plugins' keys from source to destination dictionary. Creates hierarchy in destination if needed.
     After moving, recursively remove any keys in the source that are left empty.
     """
+    source = copy.deepcopy(source)
+    destination = copy.deepcopy(destination)
 
     def recursive_move(src, dest, path=None):
         if path is None:
@@ -1329,6 +1332,7 @@
 
     recursive_move(source, destination)
     prune_empty_dicts(source)
+    return source, destination
 
 
 _table_config_keys = (
@@ -1351,10 +1355,12 @@
     Move all known table configuration keys from metadata to config.
     """
     if "databases" not in metadata:
-        return
+        return metadata, config
+    metadata = copy.deepcopy(metadata)
+    config = copy.deepcopy(config)
     for database_name, database in metadata["databases"].items():
         if "tables" not in database:
             continue
         for table_name, table in database["tables"].items():
             for key in _table_config_keys:
                 if key in table:
@@ -1366,6 +1372,7 @@
                         key
                     )
     prune_empty_dicts(metadata)
+    return metadata, config
 
 
 def redact_keys(original: dict, key_patterns: Iterable) -> dict:

tests/test_api.py

@@ -771,7 +771,7 @@ def test_databases_json(app_client_two_attached_databases_one_immutable):
 @pytest.mark.asyncio
 async def test_metadata_json(ds_client):
     response = await ds_client.get("/-/metadata.json")
-    assert response.json() == METADATA
+    assert response.json() == ds_client.ds.metadata()
 
 
 @pytest.mark.asyncio

tests/test_html.py

@@ -753,7 +753,7 @@ async def test_metadata_json_html(ds_client):
     response = await ds_client.get("/-/metadata")
     assert response.status_code == 200
     pre = Soup(response.content, "html.parser").find("pre")
-    assert METADATA == json.loads(pre.text)
+    assert ds_client.ds.metadata() == json.loads(pre.text)
 
 
 @pytest.mark.asyncio