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

Applied Black

Browse source
This commit is contained in:
Simon Willison 2021-08-19 13:27:34 -07:00
commit 450ab1a36b
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
datasette/utils/__init__.py
View file

@ -1108,11 +1108,14 @@ def columns_for_query(conn, sql, params=None):
} }
print(f"{table_rootpage_by_register=}") print(f"{table_rootpage_by_register=}")
names_and_types_by_rootpage = dict( names_and_types_by_rootpage = dict(
[(r[0], (r[1], r[2])) for r in conn.execute( [
(r[0], (r[1], r[2]))
for r in conn.execute(
"select rootpage, name, type from sqlite_master where rootpage in ({})".format( "select rootpage, name, type from sqlite_master where rootpage in ({})".format(
", ".join(map(str, table_rootpage_by_register.values())) ", ".join(map(str, table_rootpage_by_register.values()))
) )
)] )
]
) )
print(f"{names_and_types_by_rootpage=}") print(f"{names_and_types_by_rootpage=}")
columns_by_column_register = {} columns_by_column_register = {}
@ -1122,18 +1125,26 @@ def columns_for_query(conn, sql, params=None):
print(f"{table_id=} {cid=} {column_register=}") print(f"{table_id=} {cid=} {column_register=}")
table = None table = None
try: try:
table = names_and_types_by_rootpage[table_rootpage_by_register[table_id]][0] table = names_and_types_by_rootpage[
table_rootpage_by_register[table_id]
][0]
columns_by_column_register[column_register] = (table, cid) columns_by_column_register[column_register] = (table, cid)
except KeyError as e: except KeyError as e:
print(" KeyError") print(" KeyError")
print(" ", e) print(" ", e)
print(" table = names_and_types_by_rootpage[table_rootpage_by_register[table_id]][0]") print(
print(f" {names_and_types_by_rootpage=} {table_rootpage_by_register=} {table_id=}") " table = names_and_types_by_rootpage[table_rootpage_by_register[table_id]][0]"
)
print(
f" {names_and_types_by_rootpage=} {table_rootpage_by_register=} {table_id=}"
)
print(" columns_by_column_register[column_register] = (table, cid)") print(" columns_by_column_register[column_register] = (table, cid)")
print(f" {column_register=} = ({table=}, {cid=})") print(f" {column_register=} = ({table=}, {cid=})")
pass pass
result_row = [dict(r) for r in opcodes if r["opcode"] == "ResultRow"][0] result_row = [dict(r) for r in opcodes if r["opcode"] == "ResultRow"][0]
result_registers = list(range(result_row["p1"], result_row["p1"] + result_row["p2"])) result_registers = list(
range(result_row["p1"], result_row["p1"] + result_row["p2"])
)
print(f"{result_registers=}") print(f"{result_registers=}")
print(f"{columns_by_column_register=}") print(f"{columns_by_column_register=}")
all_column_names = {} all_column_names = {}