github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename metadata tables and add schema to docs, refs #2382

Browse source
This commit is contained in:
Simon Willison 2024-08-05 13:53:55 -07:00
commit 2b0a61ee19
5 changed files with 173 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

16
datasette/app.py
View file

@ -684,7 +684,7 @@ class Datasette:
SELECT
key,
value
FROM datasette_metadata_instance_entries
FROM metadata_instance
"""
)
return dict(rows)
@ -695,7 +695,7 @@ class Datasette:
SELECT
key,
value
FROM datasette_metadata_database_entries
FROM metadata_databases
WHERE database_name = ?
""",
[database_name],
@ -708,7 +708,7 @@ class Datasette:
SELECT
key,
value
FROM datasette_metadata_resource_entries
FROM metadata_resources
WHERE database_name = ?
AND resource_name = ?
""",
@ -724,7 +724,7 @@ class Datasette:
SELECT
key,
value
FROM datasette_metadata_column_entries
FROM metadata_columns
WHERE database_name = ?
AND resource_name = ?
AND column_name = ?
@ -737,7 +737,7 @@ class Datasette:
# TODO upsert only supported on SQLite 3.24.0 (2018-06-04)
await self.get_internal_database().execute_write(
"""
INSERT INTO datasette_metadata_instance_entries(key, value)
INSERT INTO metadata_instance(key, value)
VALUES(?, ?)
ON CONFLICT(key) DO UPDATE SET value = excluded.value;
""",
@ -748,7 +748,7 @@ class Datasette:
# TODO upsert only supported on SQLite 3.24.0 (2018-06-04)
await self.get_internal_database().execute_write(
"""
INSERT INTO datasette_metadata_database_entries(database_name, key, value)
INSERT INTO metadata_databases(database_name, key, value)
VALUES(?, ?, ?)
ON CONFLICT(database_name, key) DO UPDATE SET value = excluded.value;
""",
@ -761,7 +761,7 @@ class Datasette:
# TODO upsert only supported on SQLite 3.24.0 (2018-06-04)
await self.get_internal_database().execute_write(
"""
INSERT INTO datasette_metadata_resource_entries(database_name, resource_name, key, value)
INSERT INTO metadata_resources(database_name, resource_name, key, value)
VALUES(?, ?, ?, ?)
ON CONFLICT(database_name, resource_name, key) DO UPDATE SET value = excluded.value;
""",
@ -779,7 +779,7 @@ class Datasette:
# TODO upsert only supported on SQLite 3.24.0 (2018-06-04)
await self.get_internal_database().execute_write(
"""
INSERT INTO datasette_metadata_column_entries(database_name, resource_name, column_name, key, value)
INSERT INTO metadata_columns(database_name, resource_name, column_name, key, value)
VALUES(?, ?, ?, ?, ?)
ON CONFLICT(database_name, resource_name, column_name, key) DO UPDATE SET value = excluded.value;
""",

62
datasette/utils/internal_db.py
View file

@ -68,37 +68,39 @@ async def init_internal_db(db):
async def initialize_metadata_tables(db):
await db.execute_write_script(
"""
CREATE TABLE IF NOT EXISTS datasette_metadata_instance_entries(
key text,
value text,
unique(key)
);
CREATE TABLE IF NOT EXISTS datasette_metadata_database_entries(
database_name text,
key text,
value text,
unique(database_name, key)
);
CREATE TABLE IF NOT EXISTS datasette_metadata_resource_entries(
database_name text,
resource_name text,
key text,
value text,
unique(database_name, resource_name, key)
);
CREATE TABLE IF NOT EXISTS datasette_metadata_column_entries(
database_name text,
resource_name text,
column_name text,
key text,
value text,
unique(database_name, resource_name, column_name, key)
);
textwrap.dedent(
"""
CREATE TABLE IF NOT EXISTS metadata_instance (
key text,
value text,
unique(key)
);
CREATE TABLE IF NOT EXISTS metadata_databases (
database_name text,
key text,
value text,
unique(database_name, key)
);
CREATE TABLE IF NOT EXISTS metadata_resources (
database_name text,
resource_name text,
key text,
value text,
unique(database_name, resource_name, key)
);
CREATE TABLE IF NOT EXISTS metadata_columns (
database_name text,
resource_name text,
column_name text,
key text,
value text,
unique(database_name, resource_name, column_name, key)
);
"""
)
)

4
datasette/views/table.py
View file

@ -153,7 +153,7 @@ async def display_columns_and_rows(
SELECT
column_name,
value
FROM datasette_metadata_column_entries
FROM metadata_columns
WHERE database_name = ?
AND resource_name = ?
AND key = 'description'
@ -1499,7 +1499,7 @@ async def table_view_data(
SELECT
column_name,
value
FROM datasette_metadata_column_entries
FROM metadata_columns
WHERE database_name = ?
AND resource_name = ?
AND key = 'description'