Merge branch 'main' into sqlite-cleanup

nodejs · Jan 21, 2025 · a248b67 · a248b67
2 parents 3ba69e8 + a364e7c
commit a248b67
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/lib/cache/sqlite-cache-store.js b/lib/cache/sqlite-cache-store.js
@@ -170,8 +170,7 @@ module.exports = class SqliteCacheStore {
         etag = ?,
         cacheControlDirectives = ?,
         cachedAt = ?,
-        staleAt = ?,
-        deleteAt = ?
+        staleAt = ?
       WHERE
         id = ?
     `)
@@ -189,9 +188,8 @@ module.exports = class SqliteCacheStore {
         cacheControlDirectives,
         vary,
         cachedAt,
-        staleAt,
-        deleteAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        staleAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `)
 
     this.#deleteByUrlQuery = this.#db.prepare(
@@ -278,7 +276,6 @@ module.exports = class SqliteCacheStore {
         value.cacheControlDirectives ? JSON.stringify(value.cacheControlDirectives) : null,
         value.cachedAt,
         value.staleAt,
-        value.deleteAt,
         existingValue.id
       )
     } else {
@@ -296,8 +293,7 @@ module.exports = class SqliteCacheStore {
         value.cacheControlDirectives ? JSON.stringify(value.cacheControlDirectives) : null,
         value.vary ? JSON.stringify(value.vary) : null,
         value.cachedAt,
-        value.staleAt,
-        value.deleteAt
+        value.staleAt
       )
     }
   }
@@ -332,7 +328,7 @@ module.exports = class SqliteCacheStore {
         callback()
       },
       final (callback) {
-        store.set(key, { ...value, body })
+        store.set(key,
         callback()
       }
     })