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

expandable_columns() no longer uses inspect, refs #420

Browse source
This commit is contained in:
Simon Willison 2019-04-06 20:46:08 -07:00
commit 36bd6558b0
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
datasette/views/table.py
View file

@ -44,20 +44,11 @@ class RowTableShared(BaseView):
sortable_columns.add("rowid") sortable_columns.add("rowid")
return sortable_columns return sortable_columns
def expandable_columns(self, database, table): async def expandable_columns(self, database, table):
# Returns list of (fk_dict, label_column-or-None) pairs for that table # Returns list of (fk_dict, label_column-or-None) pairs for that table
tables = self.ds.inspect()[database].get("tables", {})
table_info = tables.get(table)
if not table_info:
return []
expandables = [] expandables = []
for fk in table_info["foreign_keys"]["outgoing"]: for fk in await self.ds.foreign_keys_for_table(database, table):
label_column = ( label_column = await self.ds.label_column_for_table(database, fk["other_table"])
self.ds.table_metadata(
database, fk["other_table"]
).get("label_column")
or tables.get(fk["other_table"], {}).get("label_column")
) or None
expandables.append((fk, label_column)) expandables.append((fk, label_column))
return expandables return expandables
@ -582,7 +573,7 @@ class TableView(RowTableShared):
# Expand labeled columns if requested # Expand labeled columns if requested
expanded_columns = [] expanded_columns = []
expandable_columns = self.expandable_columns(database, table) expandable_columns = await self.expandable_columns(database, table)
columns_to_expand = None columns_to_expand = None
try: try:
all_labels = value_as_boolean(special_args.get("_labels", "")) all_labels = value_as_boolean(special_args.get("_labels", ""))