Fixed remaining code and docs for new block=True default, closes #1579

This commit is contained in:
Simon Willison 2021-12-23 11:18:20 -08:00
commit 8c401ee0f0
6 changed files with 19 additions and 39 deletions

View file

@ -367,7 +367,6 @@ class Datasette:
VALUES (?, ?, ?, ?)
""",
[database_name, str(db.path), db.is_memory, schema_version],
block=True,
)
await populate_schema_tables(internal_db, db)

View file

@ -62,7 +62,7 @@ async def init_internal_db(db):
);
"""
).strip()
await db.execute_write_script(create_tables_sql, block=True)
await db.execute_write_script(create_tables_sql)
async def populate_schema_tables(internal_db, db):
@ -76,7 +76,7 @@ async def populate_schema_tables(internal_db, db):
)
conn.execute("DELETE FROM indexes WHERE database_name = ?", [database_name])
await internal_db.execute_write_fn(delete_everything, block=True)
await internal_db.execute_write_fn(delete_everything)
tables = (await db.execute("select * from sqlite_master WHERE type = 'table'")).rows
@ -137,7 +137,6 @@ async def populate_schema_tables(internal_db, db):
values (?, ?, ?, ?)
""",
tables_to_insert,
block=True,
)
await internal_db.execute_write_many(
"""
@ -148,7 +147,6 @@ async def populate_schema_tables(internal_db, db):
)
""",
columns_to_insert,
block=True,
)
await internal_db.execute_write_many(
"""
@ -159,7 +157,6 @@ async def populate_schema_tables(internal_db, db):
)
""",
foreign_keys_to_insert,
block=True,
)
await internal_db.execute_write_many(
"""
@ -170,5 +167,4 @@ async def populate_schema_tables(internal_db, db):
)
""",
indexes_to_insert,
block=True,
)

View file

@ -279,7 +279,7 @@ class QueryView(DataView):
ok = None
try:
cursor = await self.ds.databases[database].execute_write(
sql, params_for_query, block=True
sql, params_for_query
)
message = metadata.get(
"on_success_message"