Use Connection.execute shortcut instead of explicit cursors

Author: harminius

Mergin/diff.py

@@ -75,7 +75,6 @@ def get_row_from_db(db_conn, schema_table, entry_changes):
     Fetches a single row from DB's table based on the values of pkeys
     in changeset entry
     """
-    c = db_conn.cursor()
     where_clauses = []
     query_params = []
 
@@ -88,9 +87,7 @@ def get_row_from_db(db_conn, schema_table, entry_changes):
     # We parameterize values securely; table/column names are trusted internal schema objects.
     query = 'SELECT * FROM "{}" WHERE {}'.format(schema_table.name, " AND ".join(where_clauses))  # nosec B608
 
-    c.execute(query, tuple(query_params))
-
-    return c.fetchone()
+    return db_conn.execute(query, tuple(query_params)).fetchone()
 
 
 def parse_gpkg_geom_encoding(wkb_with_gpkg_hdr):

Mergin/processing/algs/download_vector_tiles.py

@@ -56,26 +56,23 @@ def create(self):
             "CREATE UNIQUE INDEX tile_index on tiles (zoom_level, tile_column, tile_row);"
             "COMMIT;"
         )
-        cur = self.conn.cursor()
-        cur.executescript(sql)
+        self.conn.executescript(sql)
         return True
 
     def set_metadata_value(self, key, value):
         if self.conn is None:
             return
 
         params = (key, value)
-        cur = self.conn.cursor()
-        cur.execute("insert into metadata values (?, ?)", params)
+        self.conn.execute("insert into metadata values (?, ?)", params)
         self.conn.commit()
 
     def set_tile_data(self, z, x, y, data):
         if self.conn is None:
             return
 
         params = (z, x, y, data)
-        cur = self.conn.cursor()
-        cur.execute("insert into tiles values (?, ?, ?, ?)", params)
+        self.conn.execute("insert into tiles values (?, ?, ?, ?)", params)
         self.conn.commit()
 
     def close(self):