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

Refactor Datasette methods to ConnectedDatabase

Browse source 
Refs #487
This commit is contained in:
Simon Willison 2019-05-26 21:56:43 -07:00
commit 026c84db30
5 changed files with 78 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

5
datasette/views/base.py
View file

@ -183,7 +183,7 @@ class BaseView(RenderMixin):
if "table_and_format" in kwargs:
async def async_table_exists(t):
return await self.ds.table_exists(name, t)
return await db.table_exists(t)
table, _format = await resolve_table_and_format(
table_and_format=urllib.parse.unquote_plus(
@ -328,9 +328,10 @@ class BaseView(RenderMixin):
if not _format:
_format = (args.pop("as_format", None) or "").lstrip(".")
if "table_and_format" in args:
db = self.ds.databases[database]
async def async_table_exists(t):
return await self.ds.table_exists(database, t)
return await db.table_exists(t)
table, _ext_format = await resolve_table_and_format(
table_and_format=urllib.parse.unquote_plus(args["table_and_format"]),

2
datasette/views/database.py
View file

@ -36,7 +36,7 @@ class DatabaseView(BaseView):
tables = []
for table in table_counts:
table_columns = await self.ds.table_columns(database, table)
table_columns = await db.table_columns(table)
tables.append(
{
"name": table,

2
datasette/views/index.py
View file

@ -42,7 +42,7 @@ class IndexView(RenderMixin):
table_counts = {}
tables = {}
for table in table_names:
table_columns = await self.ds.table_columns(name, table)
table_columns = await db.table_columns(table)
tables[table] = {
"name": table,
"columns": table_columns,

28
datasette/views/table.py
View file

@ -41,11 +41,12 @@ LINK_WITH_VALUE = '<a href="/{database}/{table}/{link_id}">{id}</a>'
class RowTableShared(BaseView):
async def sortable_columns_for_table(self, database, table, use_rowid):
db = self.ds.databases[database]
table_metadata = self.ds.table_metadata(database, table)
if "sortable_columns" in table_metadata:
sortable_columns = set(table_metadata["sortable_columns"])
else:
sortable_columns = set(await self.ds.table_columns(database, table))
sortable_columns = set(await db.table_columns(table))
if use_rowid:
sortable_columns.add("rowid")
return sortable_columns
@ -53,10 +54,9 @@ class RowTableShared(BaseView):
async def expandable_columns(self, database, table):
# Returns list of (fk_dict, label_column-or-None) pairs for that table
expandables = []
for fk in await self.ds.foreign_keys_for_table(database, table):
label_column = await self.ds.label_column_for_table(
database, fk["other_table"]
)
db = self.ds.databases[database]
for fk in await db.foreign_keys_for_table(table):
label_column = await db.label_column_for_table(fk["other_table"])
expandables.append((fk, label_column))
return expandables
@ -64,6 +64,7 @@ class RowTableShared(BaseView):
self, database, table, description, rows, link_column=False, truncate_cells=0
):
"Returns columns, rows for specified table - including fancy foreign key treatment"
db = self.ds.databases[database]
table_metadata = self.ds.table_metadata(database, table)
sortable_columns = await self.sortable_columns_for_table(database, table, True)
columns = [
@ -74,7 +75,7 @@ class RowTableShared(BaseView):
)
column_to_foreign_key_table = {
fk["column"]: fk["other_table"]
for fk in await self.ds.foreign_keys_for_table(database, table)
for fk in await db.foreign_keys_for_table(table)
}
cell_rows = []
@ -206,11 +207,12 @@ class TableView(RowTableShared):
editable=False,
canned_query=table,
)
is_view = bool(await self.ds.get_view_definition(database, table))
table_exists = bool(await self.ds.table_exists(database, table))
db = self.ds.databases[database]
is_view = bool(await db.get_view_definition(table))
table_exists = bool(await db.table_exists(table))
if not is_view and not table_exists:
raise NotFound("Table not found: {}".format(table))
pks = await self.ds.execute_against_connection_in_thread(
database, lambda conn: detect_primary_keys(conn, table)
)
@ -352,9 +354,7 @@ class TableView(RowTableShared):
# More complex: search against specific columns
for i, (key, search_text) in enumerate(search_args.items()):
search_col = key.split("_search_", 1)[1]
if search_col not in await self.ds.table_columns(
database, fts_table
):
if search_col not in await db.table_columns(fts_table):
raise DatasetteError("Cannot search by that column", status=400)
where_clauses.append(
@ -739,8 +739,8 @@ class TableView(RowTableShared):
"_rows_and_columns.html",
],
"metadata": metadata,
"view_definition": await self.ds.get_view_definition(database, table),
"table_definition": await self.ds.get_table_definition(database, table),
"view_definition": await db.get_view_definition(table),
"table_definition": await db.get_table_definition(table),
}
return (