fix(codegen-ts): drop prepared-statement pattern from renderFindByIdFn (FR2 followup)

The prepared-statement shape only made sense when the Base/Prepared constants
were hoisted to module scope and prepared once at import time. With FR2's
parameter-passed `db`, the constants moved inside the function body — so
.prepare() now runs on every call.

On Postgres that issues PREPARE round trips per call and risks collisions on
the named prepared statement; on SQLite it allocates a fresh statement handle
each call. Strictly worse than a plain select().

Simplify to the same shape the other helpers use:
  const [x] = await db.select().from(table).where(eq(...)).limit(1);
  return x ?? null;

Removes the unused prepareName() helper, the dialect branch on prepArg, the
sql@drizzle-orm import in this function, and the corresponding prepared-shape
tests. Goldens regenerate.

If a future adopter measures a real cost on hot-path find-by-id, the
runtime-ts package can offer a "prepared statement cache" factory — that's a
separate FR.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: dmealing

server/typescript/packages/codegen-ts/src/templates/queries.ts

@@ -5,12 +5,7 @@ import { code, imp, type Code } from "ts-poet";
 import type { MetaObject } from "@metaobjectsdev/metadata";
 import { IDENTITY_ATTR_FIELDS } from "@metaobjectsdev/metadata";
 import type { RenderContext } from "../render-context.js";
-import { variableNameFromEntity, toSnakeCase, pluralize } from "../naming.js";
-
-/** Derive a stable prepared statement name. Deterministic from entity + field names. */
-function prepareName(prefix: string, entitySnakeName: string, fieldDbName: string): string {
-  return `${prefix}_${entitySnakeName}_by_${fieldDbName}`;
-}
+import { variableNameFromEntity, pluralize } from "../naming.js";
 
 /** Get the PK field name and its TS type for a given entity. */
 function getPkInfo(entity: MetaObject, ctx: RenderContext): { fieldName: string; tsType: string } {
@@ -34,29 +29,13 @@ export function renderFindByIdFn(entity: MetaObject, ctx: RenderContext): Code {
   const varName = variableNameFromEntity(entity.name);
   const entityName = entity.name;
   const singularVar = entityName.charAt(0).toLowerCase() + entityName.slice(1);
-  const entitySnakeName = toSnakeCase(entityName);
   const { fieldName: pkField, tsType: pkType } = getPkInfo(entity, ctx);
-  const pkSnakeName = toSnakeCase(pkField);
-  const prepName = prepareName("find", entitySnakeName, pkSnakeName);
   const fnName = `find${entityName}ById`;
-  const baseVarName = `${fnName}Base`;
-  const prepVarName = `${fnName}Prepared`;
   const eqSym = imp("eq@drizzle-orm");
-  const sqlSym = imp("sql@drizzle-orm");
-
-  // Drizzle's `.prepare()` signature differs by dialect:
-  //   - Postgres: prepare(name) — the name is used by the pg driver to cache the plan
-  //   - SQLite:   prepare()     — no name; the name arg was removed in drizzle-orm 0.41+
-  const prepArg = ctx.dialect === "postgres" ? `"${prepName}"` : "";
 
   return code`
 export async function ${fnName}(db: Db, ${pkField}: ${pkType}): Promise<${entityName} | null> {
-  const ${baseVarName} = db
-    .select()
-    .from(${varName})
-    .where(${eqSym}(${varName}.${pkField}, ${sqlSym}.placeholder(${JSON.stringify(pkField)})));
-  const ${prepVarName} = ${baseVarName}.prepare(${prepArg});
-  const [${singularVar}] = await ${prepVarName}.execute({ ${pkField} });
+  const [${singularVar}] = await db.select().from(${varName}).where(${eqSym}(${varName}.${pkField}, ${pkField})).limit(1);
   return ${singularVar} ?? null;
 }
 `;

server/typescript/packages/codegen-ts/test/golden/__snapshots__/package/Tag.queries.ts

@@ -1,19 +1,14 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Tag (Tag)
 // Customize via Tag.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
 type Db = BaseSQLiteDatabase<"async", Record<string, never>>;
 
 import { type Tag, TagInsertSchema, tags } from "./Tag";
 export async function findTagById(db: Db, id: number): Promise<Tag | null> {
-  const findTagByIdBase = db
-    .select()
-    .from(tags)
-    .where(eq(tags.id, sql.placeholder("id")));
-  const findTagByIdPrepared = findTagByIdBase.prepare();
-  const [tag] = await findTagByIdPrepared.execute({ id });
+  const [tag] = await db.select().from(tags).where(eq(tags.id, id)).limit(1);
   return tag ?? null;
 }
 export async function listTags(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/package/shop/commerce/Order.queries.ts

@@ -1,19 +1,18 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Order (shop::commerce::Order)
 // Customize via Order.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
 type Db = BaseSQLiteDatabase<"async", Record<string, never>>;
 
 import { type Order, OrderInsertSchema, orders } from "./Order";
 export async function findOrderById(db: Db, id: number): Promise<Order | null> {
-  const findOrderByIdBase = db
+  const [order] = await db
     .select()
     .from(orders)
-    .where(eq(orders.id, sql.placeholder("id")));
-  const findOrderByIdPrepared = findOrderByIdBase.prepare();
-  const [order] = await findOrderByIdPrepared.execute({ id });
+    .where(eq(orders.id, id))
+    .limit(1);
   return order ?? null;
 }
 export async function listOrders(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/package/shop/commerce/Product.queries.ts

@@ -1,7 +1,7 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Product (shop::commerce::Product)
 // Customize via Product.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
 type Db = BaseSQLiteDatabase<"async", Record<string, never>>;
@@ -11,12 +11,11 @@ export async function findProductById(
   db: Db,
   id: number,
 ): Promise<Product | null> {
-  const findProductByIdBase = db
+  const [product] = await db
     .select()
     .from(products)
-    .where(eq(products.id, sql.placeholder("id")));
-  const findProductByIdPrepared = findProductByIdBase.prepare();
-  const [product] = await findProductByIdPrepared.execute({ id });
+    .where(eq(products.id, id))
+    .limit(1);
   return product ?? null;
 }
 export async function listProducts(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/package/shop/users/Customer.queries.ts

@@ -1,7 +1,7 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Customer (shop::users::Customer)
 // Customize via Customer.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
 type Db = BaseSQLiteDatabase<"async", Record<string, never>>;
@@ -11,12 +11,11 @@ export async function findCustomerById(
   db: Db,
   id: number,
 ): Promise<Customer | null> {
-  const findCustomerByIdBase = db
+  const [customer] = await db
     .select()
     .from(customers)
-    .where(eq(customers.id, sql.placeholder("id")));
-  const findCustomerByIdPrepared = findCustomerByIdBase.prepare();
-  const [customer] = await findCustomerByIdPrepared.execute({ id });
+    .where(eq(customers.id, id))
+    .limit(1);
   return customer ?? null;
 }
 export async function listCustomers(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/postgres/Exercise.queries.ts

@@ -1,7 +1,7 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Exercise (Exercise)
 // Customize via Exercise.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 type Db = NodePgDatabase<Record<string, never>>;
@@ -11,14 +11,11 @@ export async function findExerciseById(
   db: Db,
   id: number,
 ): Promise<Exercise | null> {
-  const findExerciseByIdBase = db
+  const [exercise] = await db
     .select()
     .from(exercises)
-    .where(eq(exercises.id, sql.placeholder("id")));
-  const findExerciseByIdPrepared = findExerciseByIdBase.prepare(
-    "find_exercise_by_id",
-  );
-  const [exercise] = await findExerciseByIdPrepared.execute({ id });
+    .where(eq(exercises.id, id))
+    .limit(1);
   return exercise ?? null;
 }
 export async function listExercises(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/postgres/Program.queries.ts

@@ -1,7 +1,7 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Program (Program)
 // Customize via Program.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 type Db = NodePgDatabase<Record<string, never>>;
@@ -11,13 +11,11 @@ export async function findProgramById(
   db: Db,
   id: number,
 ): Promise<Program | null> {
-  const findProgramByIdBase = db
+  const [program] = await db
     .select()
     .from(programs)
-    .where(eq(programs.id, sql.placeholder("id")));
-  const findProgramByIdPrepared =
-    findProgramByIdBase.prepare("find_program_by_id");
-  const [program] = await findProgramByIdPrepared.execute({ id });
+    .where(eq(programs.id, id))
+    .limit(1);
   return program ?? null;
 }
 export async function listPrograms(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/postgres/Purchase.queries.ts

@@ -1,7 +1,7 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Purchase (Purchase)
 // Customize via Purchase.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 type Db = NodePgDatabase<Record<string, never>>;
@@ -11,14 +11,11 @@ export async function findPurchaseById(
   db: Db,
   id: number,
 ): Promise<Purchase | null> {
-  const findPurchaseByIdBase = db
+  const [purchase] = await db
     .select()
     .from(purchases)
-    .where(eq(purchases.id, sql.placeholder("id")));
-  const findPurchaseByIdPrepared = findPurchaseByIdBase.prepare(
-    "find_purchase_by_id",
-  );
-  const [purchase] = await findPurchaseByIdPrepared.execute({ id });
+    .where(eq(purchases.id, id))
+    .limit(1);
   return purchase ?? null;
 }
 export async function listPurchases(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/postgres/Subscriber.queries.ts

@@ -1,7 +1,7 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Subscriber (Subscriber)
 // Customize via Subscriber.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 type Db = NodePgDatabase<Record<string, never>>;
@@ -15,14 +15,11 @@ export async function findSubscriberById(
   db: Db,
   id: number,
 ): Promise<Subscriber | null> {
-  const findSubscriberByIdBase = db
+  const [subscriber] = await db
     .select()
     .from(subscribers)
-    .where(eq(subscribers.id, sql.placeholder("id")));
-  const findSubscriberByIdPrepared = findSubscriberByIdBase.prepare(
-    "find_subscriber_by_id",
-  );
-  const [subscriber] = await findSubscriberByIdPrepared.execute({ id });
+    .where(eq(subscribers.id, id))
+    .limit(1);
   return subscriber ?? null;
 }
 export async function listSubscribers(

server/typescript/packages/codegen-ts/test/golden/__snapshots__/postgres/Tag.queries.ts

@@ -1,19 +1,14 @@
 // @generated by @metaobjectsdev/codegen-ts — DO NOT EDIT.
 // Source metadata: Tag (Tag)
 // Customize via Tag.extra.ts in this directory (additional queries, custom logic).
-import { eq, sql } from "drizzle-orm";
+import { eq } from "drizzle-orm";
 
 import type { NodePgDatabase } from "drizzle-orm/node-postgres";
 type Db = NodePgDatabase<Record<string, never>>;
 
 import { type Tag, TagInsertSchema, tags } from "./Tag";
 export async function findTagById(db: Db, id: number): Promise<Tag | null> {
-  const findTagByIdBase = db
-    .select()
-    .from(tags)
-    .where(eq(tags.id, sql.placeholder("id")));
-  const findTagByIdPrepared = findTagByIdBase.prepare("find_tag_by_id");
-  const [tag] = await findTagByIdPrepared.execute({ id });
+  const [tag] = await db.select().from(tags).where(eq(tags.id, id)).limit(1);
   return tag ?? null;
 }
 export async function listTags(