like this then?

Author: brontolosone

lib/model/query/blobs.js

@@ -31,7 +31,7 @@ const getById = (blobId) => ({ maybeOne }) =>
   maybeOne(sql`select * from blobs where id=${blobId}`)
     .then(map(construct(Blob)));
 
-const s3CountByStatus = (status) => ({ oneFirst, run }) => {
+const s3CountByStatus = (status) => (db) => {
   // Note: This takes out rowlocks on all rows in `blobs`, so
   // if this is run in a transaction, then those locks aren't
   // released until the end of the transaction.
@@ -51,31 +51,25 @@ const s3CountByStatus = (status) => ({ oneFirst, run }) => {
     )`;
   // in_progress is an implicit status
   if (status === 'in_progress') {
-    return oneFirst(sql`
-      SAVEPOINT peeklocked;
-      WITH ${lockCTEs}
-      SELECT count FROM locked
-    `).then(cnt =>
-      run(
-        sql`ROLLBACK TO SAVEPOINT peeklocked`
-      ).then(() => cnt)
+    return db.transaction(tx =>
+      tx.oneFirst(sql`
+        WITH ${lockCTEs}
+        SELECT count FROM locked
+      `)
     );
   } else if (status === 'pending') {
-    return oneFirst(sql`
-      SAVEPOINT peeklocked;
-      WITH
-        allpending AS (
-          SELECT COUNT(*) FROM blobs WHERE s3_status='pending'
-        ),
-        ${lockCTEs}
-      SELECT allpending.count-locked.count FROM allpending, locked
-    `).then(cnt =>
-      run(
-        sql`ROLLBACK TO SAVEPOINT peeklocked`
-      ).then(() => cnt)
+    return db.transaction(tx =>
+      tx.oneFirst(sql`
+        WITH
+          allpending AS (
+            SELECT COUNT(*) FROM blobs WHERE s3_status='pending'
+          ),
+          ${lockCTEs}
+        SELECT allpending.count-locked.count FROM allpending, locked
+      `)
     );
   } else {
-    return oneFirst(sql`SELECT COUNT(*) FROM blobs WHERE s3_status=${status}`);
+    return db.oneFirst(sql`SELECT COUNT(*) FROM blobs WHERE s3_status=${status}`);
   }
 };