Merge pull request #2722 from cloudflare/kenton/no-prepared

Un-ship SQL prepared statements.
cloudflare · Sep 17, 2024 · c70a208 · c70a208
2 parents d1a7d6e + f1a25eb
commit c70a208
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/workerd/api/sql-test.wd-test b/src/workerd/api/sql-test.wd-test
@@ -12,7 +12,7 @@ const config :Workerd.Config = (
 const mainWorker :Workerd.Worker = (
   compatibilityDate = "2024-03-04",
 
-  # "experimental" flag is needed to test `sql.ingest()`
+  # "experimental" flag is needed to test `sql.ingest()` and `sql.prepare()`.
   compatibilityFlags = ["experimental", "nodejs_compat"],
 
   modules = [

diff --git a/src/workerd/api/sql.h b/src/workerd/api/sql.h
@@ -32,7 +32,12 @@ class SqlStorage final: public jsg::Object, private SqliteDatabase::Regulator {
 
   JSG_RESOURCE_TYPE(SqlStorage, CompatibilityFlags::Reader flags) {
     JSG_METHOD(exec);
-    JSG_METHOD(prepare);
+
+    // Prepared statement API is experimental-only and deprecated. exec() will automatically
+    // handle caching prepared statements, so apps don't need to worry about it.
+    if (flags.getWorkerdExperimental()) {
+      JSG_METHOD(prepare);
+    }
 
     // Make sure that the 'ingest' function is still experimental-only if and when
     // the SQL API becomes publicly available.