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

Fix for incorrect REFERENCES in internal DB

Browse source 
Refs #2466
This commit is contained in:
Simon Willison 2025-02-12 19:40:43 -08:00
commit e59fd01757
3 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
datasette/utils/internal_db.py
View file

@ -17,7 +17,7 @@ async def init_internal_db(db):
rootpage INTEGER, rootpage INTEGER,
sql TEXT, sql TEXT,
PRIMARY KEY (database_name, table_name), PRIMARY KEY (database_name, table_name),
FOREIGN KEY (database_name) REFERENCES databases(database_name) FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name)
); );
CREATE TABLE IF NOT EXISTS catalog_columns ( CREATE TABLE IF NOT EXISTS catalog_columns (
database_name TEXT, database_name TEXT,
@ -30,8 +30,8 @@ async def init_internal_db(db):
is_pk INTEGER, -- renamed from pk is_pk INTEGER, -- renamed from pk
hidden INTEGER, hidden INTEGER,
PRIMARY KEY (database_name, table_name, name), PRIMARY KEY (database_name, table_name, name),
FOREIGN KEY (database_name) REFERENCES databases(database_name), FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name),
FOREIGN KEY (database_name, table_name) REFERENCES tables(database_name, table_name) FOREIGN KEY (database_name, table_name) REFERENCES catalog_tables(database_name, table_name)
); );
CREATE TABLE IF NOT EXISTS catalog_indexes ( CREATE TABLE IF NOT EXISTS catalog_indexes (
database_name TEXT, database_name TEXT,
@ -42,8 +42,8 @@ async def init_internal_db(db):
origin TEXT, origin TEXT,
partial INTEGER, partial INTEGER,
PRIMARY KEY (database_name, table_name, name), PRIMARY KEY (database_name, table_name, name),
FOREIGN KEY (database_name) REFERENCES databases(database_name), FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name),
FOREIGN KEY (database_name, table_name) REFERENCES tables(database_name, table_name) FOREIGN KEY (database_name, table_name) REFERENCES catalog_tables(database_name, table_name)
); );
CREATE TABLE IF NOT EXISTS catalog_foreign_keys ( CREATE TABLE IF NOT EXISTS catalog_foreign_keys (
database_name TEXT, database_name TEXT,
@ -57,8 +57,8 @@ async def init_internal_db(db):
on_delete TEXT, on_delete TEXT,
match TEXT, match TEXT,
PRIMARY KEY (database_name, table_name, id, seq), PRIMARY KEY (database_name, table_name, id, seq),
FOREIGN KEY (database_name) REFERENCES databases(database_name), FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name),
FOREIGN KEY (database_name, table_name) REFERENCES tables(database_name, table_name) FOREIGN KEY (database_name, table_name) REFERENCES catalog_tables(database_name, table_name)
); );
""" """
).strip() ).strip()

14
docs/internals.rst
View file

@ -1382,7 +1382,7 @@ The internal database schema is as follows:
rootpage INTEGER, rootpage INTEGER,
sql TEXT, sql TEXT,
PRIMARY KEY (database_name, table_name), PRIMARY KEY (database_name, table_name),
FOREIGN KEY (database_name) REFERENCES databases(database_name) FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name)
); );
CREATE TABLE catalog_columns ( CREATE TABLE catalog_columns (
database_name TEXT, database_name TEXT,
@ -1395,8 +1395,8 @@ The internal database schema is as follows:
is_pk INTEGER, -- renamed from pk is_pk INTEGER, -- renamed from pk
hidden INTEGER, hidden INTEGER,
PRIMARY KEY (database_name, table_name, name), PRIMARY KEY (database_name, table_name, name),
FOREIGN KEY (database_name) REFERENCES databases(database_name), FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name),
FOREIGN KEY (database_name, table_name) REFERENCES tables(database_name, table_name) FOREIGN KEY (database_name, table_name) REFERENCES catalog_tables(database_name, table_name)
); );
CREATE TABLE catalog_indexes ( CREATE TABLE catalog_indexes (
database_name TEXT, database_name TEXT,
@ -1407,8 +1407,8 @@ The internal database schema is as follows:
origin TEXT, origin TEXT,
partial INTEGER, partial INTEGER,
PRIMARY KEY (database_name, table_name, name), PRIMARY KEY (database_name, table_name, name),
FOREIGN KEY (database_name) REFERENCES databases(database_name), FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name),
FOREIGN KEY (database_name, table_name) REFERENCES tables(database_name, table_name) FOREIGN KEY (database_name, table_name) REFERENCES catalog_tables(database_name, table_name)
); );
CREATE TABLE catalog_foreign_keys ( CREATE TABLE catalog_foreign_keys (
database_name TEXT, database_name TEXT,
@ -1422,8 +1422,8 @@ The internal database schema is as follows:
on_delete TEXT, on_delete TEXT,
match TEXT, match TEXT,
PRIMARY KEY (database_name, table_name, id, seq), PRIMARY KEY (database_name, table_name, id, seq),
FOREIGN KEY (database_name) REFERENCES databases(database_name), FOREIGN KEY (database_name) REFERENCES catalog_databases(database_name),
FOREIGN KEY (database_name, table_name) REFERENCES tables(database_name, table_name) FOREIGN KEY (database_name, table_name) REFERENCES catalog_tables(database_name, table_name)
); );
CREATE TABLE metadata_instance ( CREATE TABLE metadata_instance (
key text, key text,

23
tests/test_internal_db.py
View file

@ -1,4 +1,5 @@
import pytest import pytest
import sqlite_utils
# ensure refresh_schemas() gets called before interacting with internal_db # ensure refresh_schemas() gets called before interacting with internal_db
@ -59,3 +60,25 @@ async def test_internal_foreign_keys(ds_client):
"table_name", "table_name",
"from", "from",
} }
@pytest.mark.asyncio
async def test_internal_foreign_key_references(ds_client):
internal_db = await ensure_internal(ds_client)
def inner(conn):
db = sqlite_utils.Database(conn)
table_names = db.table_names()
for table in db.tables:
for fk in table.foreign_keys:
other_table = fk.other_table
other_column = fk.other_column
message = 'Column "{}.{}" references other column "{}.{}" which does not exist'.format(
table.name, fk.column, other_table, other_column
)
assert other_table in table_names, message + " (bad table)"
assert other_column in db[other_table].columns_dict, (
message + " (bad column)"
)
await internal_db.execute_fn(inner)