Replaced self.ds.execute with db.execute in more places

simonw · Feb 14, 2020 · f1442a8 · f1442a8
1 parent efa54b4
commit f1442a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/datasette/database.py b/datasette/database.py
@@ -300,8 +300,7 @@ async def get_table_definition(self, table, type_="table"):
         bits = [table_definition_rows[0][0] + ";"]
         # Add on any indexes
         index_rows = list(
-            await self.ds.execute(
-                self.name,
+            await self.execute(
                 "select sql from sqlite_master where tbl_name = :n and type='index' and sql is not null",
                 {"n": table},
             )

diff --git a/datasette/views/table.py b/datasette/views/table.py
@@ -533,17 +533,13 @@ async def data(
         if request.raw_args.get("_timelimit"):
             extra_args["custom_time_limit"] = int(request.raw_args["_timelimit"])
 
-        results = await self.ds.execute(
-            database, sql, params, truncate=True, **extra_args
-        )
+        results = await db.execute(sql, params, truncate=True, **extra_args)
 
         # Number of filtered rows in whole set:
         filtered_table_rows_count = None
         if count_sql:
             try:
-                count_rows = list(
-                    await self.ds.execute(database, count_sql, from_sql_params)
-                )
+                count_rows = list(await db.execute(count_sql, from_sql_params))
                 filtered_table_rows_count = count_rows[0][0]
             except QueryInterrupted:
                 pass
@@ -795,7 +791,7 @@ async def data(self, request, database, hash, table, pk_path, default_labels=Fal
         params = {}
         for i, pk_value in enumerate(pk_values):
             params["p{}".format(i)] = pk_value
-        results = await self.ds.execute(database, sql, params, truncate=True)
+        results = await db.execute(sql, params, truncate=True)
         columns = [r[0] for r in results.description]
         rows = list(results.rows)
         if not rows:
@@ -876,7 +872,7 @@ async def foreign_key_tables(self, database, table, pk_values):
             ]
         )
         try:
-            rows = list(await self.ds.execute(database, sql, {"id": pk_values[0]}))
+            rows = list(await db.execute(sql, {"id": pk_values[0]}))
         except sqlite3.OperationalError:
             # Almost certainly hit the timeout
             return []