Revert "move where the json.stringify is being done"

Author: james-elicx

packages/cloudflare/src/api/d1-tag-cache.ts

@@ -14,8 +14,6 @@ import { getCloudflareContext } from "./cloudflare-context.js";
  * two columns; `tag`, and `path`. The table name can be configured with `NEXT_CACHE_D1_TAGS_TABLE`
  * environment variable.
  *
- * This table should be populated using an SQL file that is generated during the build process.
- *
  * **Tag revalidations**
  *
  * Revalidation times for tags are stored in a `revalidations` table that contains two columns; `tags`,
@@ -33,7 +31,7 @@ class D1TagCache implements TagCache {
 
     try {
       const { success, results } = await db
-        .prepare(`SELECT tag FROM ${table.tags} WHERE path = ?`)
+        .prepare(`SELECT tag FROM ${JSON.stringify(table.tags)} WHERE path = ?`)
         .bind(path)
         .all<{ tag: string }>();
 
@@ -57,7 +55,7 @@ class D1TagCache implements TagCache {
 
     try {
       const { success, results } = await db
-        .prepare(`SELECT path FROM ${table.tags} WHERE tag = ?`)
+        .prepare(`SELECT path FROM ${JSON.stringify(table.tags)} WHERE tag = ?`)
         .bind(tag)
         .all<{ path: string }>();
 
@@ -80,9 +78,9 @@ class D1TagCache implements TagCache {
     try {
       const { success, results } = await db
         .prepare(
-          `SELECT ${table.revalidations}.tag FROM ${table.revalidations}
-            INNER JOIN ${table.tags} ON ${table.revalidations}.tag = ${table.tags}.tag
-            WHERE ${table.tags}.path = ? AND ${table.revalidations}.revalidatedAt > ?;`
+          `SELECT ${JSON.stringify(table.revalidations)}.tag FROM ${JSON.stringify(table.revalidations)}
+            INNER JOIN ${JSON.stringify(table.tags)} ON ${JSON.stringify(table.revalidations)}.tag = ${JSON.stringify(table.tags)}.tag
+            WHERE ${JSON.stringify(table.tags)}.path = ? AND ${JSON.stringify(table.revalidations)}.revalidatedAt > ?;`
         )
         .bind(this.getCacheKey(path), lastModified ?? 0)
         .all<{ tag: string }>();
@@ -109,15 +107,15 @@ class D1TagCache implements TagCache {
             if (revalidatedAt === 1) {
               // new tag/path mapping from set
               return db
-                .prepare(`INSERT INTO ${table.tags} (tag, path) VALUES (?, ?)`)
+                .prepare(`INSERT INTO ${JSON.stringify(table.tags)} (tag, path) VALUES (?, ?)`)
                 .bind(this.getCacheKey(tag), this.getCacheKey(path));
             }
 
             if (!uniqueTags.has(tag) && revalidatedAt !== -1) {
               // tag was revalidated
               uniqueTags.add(tag);
               return db
-                .prepare(`INSERT INTO ${table.revalidations} (tag, revalidatedAt) VALUES (?, ?)`)
+                .prepare(`INSERT INTO ${JSON.stringify(table.revalidations)} (tag, revalidatedAt) VALUES (?, ?)`)
                 .bind(this.getCacheKey(tag), revalidatedAt ?? Date.now());
             }
           })
@@ -151,8 +149,8 @@ class D1TagCache implements TagCache {
       isDisabled: false as const,
       db,
       table: {
-        tags: JSON.stringify(cfEnv.NEXT_CACHE_D1_TAGS_TABLE ?? "tags"),
-        revalidations: JSON.stringify(cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations"),
+        tags: cfEnv.NEXT_CACHE_D1_TAGS_TABLE ?? "tags",
+        revalidations: cfEnv.NEXT_CACHE_D1_REVALIDATIONS_TABLE ?? "revalidations",
       },
     };
   }