@cosmicdrift/kumiko-bundled-features 0.14.0 → 0.15.0

package/src/compliance-profiles/handlers/set-profile.write.ts

@@ -1,9 +1,10 @@
 import { ROLES } from "@cosmicdrift/kumiko-framework/auth";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   complianceProfileOverrideSchema,
   SELECTABLE_PROFILE_KEYS,
 } from "@cosmicdrift/kumiko-framework/compliance";
-import { createEventStoreExecutor, fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, type TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import {
   AccessDeniedError,
@@ -11,7 +12,6 @@ import {
   validationErrorFromZod,
   writeFailure,
 } from "@cosmicdrift/kumiko-framework/errors";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import {
   tenantComplianceProfileEntity,
@@ -100,11 +100,9 @@ export const setProfileWrite = defineWriteHandler({
     }
 
     // Upsert: existierenden Eintrag suchen
-    const existing = (await fetchOne(
-      ctx.db,
-      tenantComplianceProfileTable,
-      eq(tenantComplianceProfileTable["tenantId"], tenantId),
-    )) as { id: string; version: number } | null; // @cast-boundary db-runner
+    const existing = (await fetchOne(ctx.db, tenantComplianceProfileTable, {
+      tenantId: tenantId,
+    })) as { id: string; version: number } | null; // @cast-boundary db-runner
 
     if (existing) {
       const result = await crud.update(

package/src/compliance-profiles/resolve-for-tenant.ts

@@ -8,15 +8,15 @@
 // Beide Pfade nutzen `resolveComplianceProfile` aus framework/compliance,
 // also kein Drift zwischen Query-API und Worker-Pfad.
 
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   type ComplianceProfileKey,
   type ComplianceProfileOverride,
   type EffectiveComplianceProfile,
   resolveComplianceProfile,
 } from "@cosmicdrift/kumiko-framework/compliance";
-import { type DbRunner, fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import type { DbRunner } from "@cosmicdrift/kumiko-framework/db";
 import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
-import { eq } from "drizzle-orm";
 import { tenantComplianceProfileTable } from "./schema/profile-selection";
 
 export interface ResolveProfileForTenantArgs {
@@ -27,11 +27,9 @@ export interface ResolveProfileForTenantArgs {
 export async function resolveProfileForTenant(
   args: ResolveProfileForTenantArgs,
 ): Promise<EffectiveComplianceProfile> {
-  const row = (await fetchOne(
-    args.db,
-    tenantComplianceProfileTable,
-    eq(tenantComplianceProfileTable["tenantId"], args.tenantId),
-  )) as { profileKey: string; override: string | null } | null; // @cast-boundary db-runner
+  const row = (await fetchOne(args.db, tenantComplianceProfileTable, {
+    tenantId: args.tenantId,
+  })) as { profileKey: string; override: string | null } | null; // @cast-boundary db-runner
 
   if (!row) {
     return resolveComplianceProfile({});

package/src/compliance-profiles/schema/profile-selection.ts

@@ -1,4 +1,4 @@
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import {
   createEntity,
   createLongTextField,
@@ -46,7 +46,7 @@ export const tenantComplianceProfileEntity = createEntity({
   ],
 });
 
-export const tenantComplianceProfileTable = buildDrizzleTable(
+export const tenantComplianceProfileTable = buildEntityTable(
   "tenantComplianceProfile",
   tenantComplianceProfileEntity,
 );

package/src/compliance-profiles/seeding.ts

@@ -10,6 +10,7 @@
 //
 // Pattern matched seedTextBlock aus text-content.
 
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import type {
   ComplianceProfileKey,
   ComplianceProfileOverride,
@@ -18,11 +19,9 @@ import {
   createEventStoreExecutor,
   createTenantDb,
   type DbConnection,
-  fetchOne,
 } from "@cosmicdrift/kumiko-framework/db";
 import type { SessionUser, TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { TestUsers } from "@cosmicdrift/kumiko-framework/stack";
-import { eq } from "drizzle-orm";
 import {
   tenantComplianceProfileEntity,
   tenantComplianceProfileTable,
@@ -52,11 +51,9 @@ export async function seedComplianceProfile(
   const tdb = createTenantDb(db, opts.tenantId, "system");
   const overrideJson = opts.override !== undefined ? JSON.stringify(opts.override) : null;
 
-  const existing = (await fetchOne(
-    db,
-    tenantComplianceProfileTable,
-    eq(tenantComplianceProfileTable["tenantId"], opts.tenantId),
-  )) as { id: string; version: number } | null; // @cast-boundary db-runner
+  const existing = (await fetchOne(db, tenantComplianceProfileTable, {
+    tenantId: opts.tenantId,
+  })) as { id: string; version: number } | null; // @cast-boundary db-runner
 
   if (existing) {
     const result = await executor.update(

package/src/config/__tests__/app-overrides.test.ts

@@ -1,5 +1,5 @@
+import { describe, expect, test } from "bun:test";
 import { createTenantConfig, createUserConfig } from "@cosmicdrift/kumiko-framework/engine";
-import { describe, expect, test } from "vitest";
 import { validateAppOverrides } from "../resolver";
 
 // Minimal registry stub — validateAppOverrides only reads getConfigKey.

package/src/config/__tests__/cascade.integration.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { seedConfigValues } from "@cosmicdrift/kumiko-framework/db";
 import type {
   ConfigCascade,
@@ -20,7 +21,6 @@ import {
   TestUsers,
   unsafePushTables,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { ConfigHandlers, ConfigQueries } from "../constants";
 import { createConfigAccessorFactory, createConfigFeature } from "../feature";
 import { type ConfigResolver, createConfigResolver } from "../resolver";

package/src/config/__tests__/config.integration.ts

@@ -1,4 +1,6 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { randomBytes } from "node:crypto";
+import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   createEncryptionProvider,
   type DbConnection,
@@ -23,8 +25,6 @@ import {
   unsafePushTables,
 } from "@cosmicdrift/kumiko-framework/stack";
 import { expectErrorIncludes } from "@cosmicdrift/kumiko-framework/testing";
-import { eq } from "drizzle-orm";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { z } from "zod";
 import { ConfigHandlers, ConfigQueries } from "../constants";
 import { createConfigAccessor, createConfigAccessorFactory, createConfigFeature } from "../feature";
@@ -756,11 +756,7 @@ describe("encrypted config", () => {
     expect(value).toBe("sk-super-secret-key-12345");
 
     // Verify raw DB value is NOT plaintext
-    const { eq } = await import("drizzle-orm");
-    const [raw] = await db
-      .select({ value: configValuesTable.value })
-      .from(configValuesTable)
-      .where(eq(configValuesTable.key, "integration:config:api-secret"));
+    const [raw] = await selectMany(db, configValuesTable, { key: "integration:config:api-secret" });
     const rawValue = raw?.value as string;
     expect(rawValue).not.toBe("sk-super-secret-key-12345");
     expect(rawValue).not.toContain("sk-super-secret");
@@ -814,10 +810,7 @@ describe("configValue lifecycle events", () => {
       { key: "orders:config:max-order-count", value: 250 },
       tenantAdmin,
     );
-    const events = await db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "config-value"));
+    const events = await selectMany(db, eventsTable, { aggregateType: "config-value" });
     // The first set in the suite created the row; subsequent sets update it.
     // Look at the most recent update carrying our value to verify the
     // serialized JSON lands in the event payload (key stays on the row,
@@ -848,10 +841,7 @@ describe("configValue lifecycle events", () => {
       { key: "invoicing:config:mail-signature" },
       tenantAdmin,
     );
-    const events = await db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "config-value"));
+    const events = await selectMany(db, eventsTable, { aggregateType: "config-value" });
     const deletes = events.filter(
       (e) =>
         e.type === "config-value.deleted" &&
@@ -871,10 +861,7 @@ describe("configValue lifecycle events", () => {
       { key: "integration:config:lifecycle-probe", value: "alpha" },
       tenantAdmin,
     );
-    const events = await db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "config-value"));
+    const events = await selectMany(db, eventsTable, { aggregateType: "config-value" });
     const created = events.filter(
       (e) =>
         e.type === "config-value.created" &&
@@ -898,10 +885,7 @@ describe("configValue lifecycle events", () => {
       { key: "integration:config:lifecycle-probe", value: "beta" },
       tenantAdmin,
     );
-    const events = await db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "config-value"));
+    const events = await selectMany(db, eventsTable, { aggregateType: "config-value" });
     const updates = events.filter(
       (e) =>
         e.type === "config-value.updated" &&
@@ -925,10 +909,7 @@ describe("configValue lifecycle events", () => {
       { key: "integration:config:api-secret", value: "rotated-secret-987" },
       systemAdmin,
     );
-    const events = await db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "config-value"));
+    const events = await selectMany(db, eventsTable, { aggregateType: "config-value" });
     const created = events.filter(
       (e) =>
         e.type === "config-value.created" &&

package/src/config/db/queries/resolver.ts

@@ -0,0 +1,47 @@
+import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
+import type { DbRunner } from "@cosmicdrift/kumiko-framework/db";
+import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
+
+export type ConfigRow = {
+  readonly id: string;
+  readonly key: string;
+  readonly value: string | null;
+  readonly tenantId: TenantId;
+  readonly userId: string | null;
+};
+
+export async function selectConfigRowsForScope(
+  db: DbRunner,
+  systemTenantId: TenantId,
+  tenantId: TenantId,
+  userId: string,
+): Promise<readonly ConfigRow[]> {
+  return asRawClient(db).unsafe<ConfigRow>(
+    `SELECT id, key, value, tenant_id AS "tenantId", user_id AS "userId"
+     FROM read_config_values
+     WHERE (tenant_id = $1 AND user_id IS NULL)
+        OR (tenant_id = $2 AND user_id IS NULL)
+        OR (tenant_id = $2 AND user_id = $3)`,
+    [systemTenantId, tenantId, userId],
+  );
+}
+
+export async function selectConfigRowsForKeys(
+  db: DbRunner,
+  keys: readonly string[],
+  systemTenantId: TenantId,
+  tenantId: TenantId,
+  userId: string,
+): Promise<readonly ConfigRow[]> {
+  return asRawClient(db).unsafe<ConfigRow>(
+    `SELECT id, key, value, tenant_id AS "tenantId", user_id AS "userId"
+     FROM read_config_values
+     WHERE key = ANY($1)
+       AND (
+         (tenant_id = $2 AND user_id IS NULL)
+         OR (tenant_id = $3 AND user_id IS NULL)
+         OR (tenant_id = $3 AND user_id = $4)
+       )`,
+    [[...keys], systemTenantId, tenantId, userId],
+  );
+}

package/src/config/handlers/__tests__/prepare-config-write.test.ts

@@ -1,3 +1,4 @@
+import { describe, expect, test } from "bun:test";
 import {
   access,
   type ConfigKeyDefinition,
@@ -11,7 +12,6 @@ import {
   SYSTEM_TENANT_ID,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
-import { describe, expect, test } from "vitest";
 import { prepareConfigWrite, validateBounds } from "../../write-helpers";
 
 // Minimal Registry stub — only getConfigKey is exercised by prepareConfigWrite.

package/src/config/resolver.ts

@@ -1,9 +1,5 @@
-import {
-  type DbConnection,
-  type EncryptionProvider,
-  fetchOne,
-  type TenantDb,
-} from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import type { DbConnection, EncryptionProvider, TenantDb } from "@cosmicdrift/kumiko-framework/db";
 import type {
   ConfigCascade,
   ConfigCascadeLevel,
@@ -15,7 +11,7 @@ import type {
 } from "@cosmicdrift/kumiko-framework/engine";
 import { SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { assertUnreachable, parseJsonOrThrow } from "@cosmicdrift/kumiko-framework/utils";
-import { and, eq, inArray, isNull, or } from "drizzle-orm";
+import { selectConfigRowsForKeys, selectConfigRowsForScope } from "./db/queries/resolver";
 import { configValuesTable } from "./table";
 
 type ConfigRow = {
@@ -219,16 +215,11 @@ export function createConfigResolver(options: ConfigResolverOptions = {}): Confi
     userId: string | null,
     db: DbConnection | TenantDb,
   ): Promise<ConfigRow | null> {
-    const userCond =
-      userId !== null ? eq(configValuesTable.userId, userId) : isNull(configValuesTable.userId);
-
-    const row = await fetchOne<ConfigRow>(
-      db,
-      configValuesTable,
-      eq(configValuesTable.key, key),
-      eq(configValuesTable.tenantId, tenantId),
-      userCond,
-    );
+    const row = await fetchOne<ConfigRow>(db, configValuesTable, {
+      key,
+      tenantId,
+      userId,
+    });
 
     return row ?? null;
   }
@@ -308,23 +299,10 @@ export function createConfigResolver(options: ConfigResolverOptions = {}): Confi
 
     async getAll(tenantId, userId, db) {
       // Only load rows relevant to this user/tenant (system + tenant + user scope)
-      const rows = await db
-        .select()
-        .from(configValuesTable)
-        .where(
-          or(
-            // System-level values
-            and(eq(configValuesTable.tenantId, SYSTEM_TENANT_ID), isNull(configValuesTable.userId)),
-            // Tenant-level values
-            and(eq(configValuesTable.tenantId, tenantId), isNull(configValuesTable.userId)),
-            // User-level values
-            and(eq(configValuesTable.tenantId, tenantId), eq(configValuesTable.userId, userId)),
-          ),
-        );
+      const rows = await selectConfigRowsForScope(db, SYSTEM_TENANT_ID, tenantId, userId);
 
       const result = new Map<string, ConfigRow>();
-      for (const row of rows) {
-        const r = row as ConfigRow; // @cast-boundary db-row
+      for (const r of rows) {
         // Higher specificity wins: user > tenant > system. Under the ES
         // schema system rows carry SYSTEM_TENANT_ID instead of NULL, so the
         // "tenant set" check compares against the sentinel rather than null.
@@ -341,23 +319,13 @@ export function createConfigResolver(options: ConfigResolverOptions = {}): Confi
 
     async getAllWithSource(tenantId, userId, db) {
       // Load ALL potentially relevant rows (user + tenant + system)
-      const rows = await db
-        .select()
-        .from(configValuesTable)
-        .where(
-          or(
-            and(eq(configValuesTable.tenantId, SYSTEM_TENANT_ID), isNull(configValuesTable.userId)),
-            and(eq(configValuesTable.tenantId, tenantId), isNull(configValuesTable.userId)),
-            and(eq(configValuesTable.tenantId, tenantId), eq(configValuesTable.userId, userId)),
-          ),
-        );
+      const rows = await selectConfigRowsForScope(db, SYSTEM_TENANT_ID, tenantId, userId);
 
       const result = new Map<string, ConfigStoredRowWithSource>();
 
       // Group rows by key so we can determine the winner and its source
       const groups = new Map<string, ConfigRow[]>();
-      for (const row of rows) {
-        const r = row as ConfigRow; // @cast-boundary db-row
+      for (const r of rows) {
         const g = groups.get(r.key) ?? [];
         g.push(r);
         groups.set(r.key, g);
@@ -418,26 +386,10 @@ export function createConfigResolver(options: ConfigResolverOptions = {}): Confi
       // One SQL query for all keys + every scope (user-row,
       // tenant-row, system-row). The cascade-builder then matches
       // per-key from this preloaded set instead of querying again.
-      const rows = await db
-        .select()
-        .from(configValuesTable)
-        .where(
-          and(
-            inArray(configValuesTable.key, [...keys]),
-            or(
-              and(
-                eq(configValuesTable.tenantId, SYSTEM_TENANT_ID),
-                isNull(configValuesTable.userId),
-              ),
-              and(eq(configValuesTable.tenantId, tenantId), isNull(configValuesTable.userId)),
-              and(eq(configValuesTable.tenantId, tenantId), eq(configValuesTable.userId, userId)),
-            ),
-          ),
-        );
+      const rows = await selectConfigRowsForKeys(db, keys, SYSTEM_TENANT_ID, tenantId, userId);
 
       const grouped = new Map<string, ConfigRow[]>();
-      for (const row of rows) {
-        const r = row as ConfigRow; // @cast-boundary db-row
+      for (const r of rows) {
         const g = grouped.get(r.key) ?? [];
         g.push(r);
         grouped.set(r.key, g);

package/src/config/table.ts

@@ -1,4 +1,4 @@
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import { createEntity, createTextField } from "@cosmicdrift/kumiko-framework/engine";
 
 // Config values are event-sourced. Each (key, scope) is its own aggregate
@@ -7,13 +7,13 @@ import { createEntity, createTextField } from "@cosmicdrift/kumiko-framework/eng
 // projection in one TX. Reads stay O(1) against the projection.
 //
 // System-scope rows use SYSTEM_TENANT_ID (not null) — buildBaseColumns
-// (via buildDrizzleTable) forces tenant_id NOT NULL, so die pre-ES "NULL
+// (via buildEntityTable) forces tenant_id NOT NULL, so die pre-ES "NULL
 // means system" convention is replaced with a fixed sentinel. Der unique
 // index über (key, tenant_id, user_id) prevent duplicate writes at the DB
 // level — deklariert via entity.indexes.
 //
 // Single-Source-of-Truth: `configValueEntity`. Die DB-Tabelle wird über
-// buildDrizzleTable aus der EntityDefinition abgeleitet, der unique-Index
+// buildEntityTable aus der EntityDefinition abgeleitet, der unique-Index
 // ist via entity.indexes deklariert. Plural-Re-Export `configValuesTable`
 // dient handlers (`reset.write.ts` etc.) als typisierte Drizzle-Table-Ref.
 export const configValueEntity = createEntity({
@@ -32,4 +32,4 @@ export const configValueEntity = createEntity({
   ],
 });
 
-export const configValuesTable = buildDrizzleTable("config-value", configValueEntity);
+export const configValuesTable = buildEntityTable("config-value", configValueEntity);

package/src/config/write-helpers.ts

@@ -2,7 +2,8 @@
 // Extracted from set.write.ts so reset.write.ts + values.query.ts don't
 // have to cross-import from another handler file.
 
-import { type DbConnection, fetchOne, type TenantDb } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import type { DbConnection, TenantDb } from "@cosmicdrift/kumiko-framework/db";
 import {
   type ConfigKeyDefinition,
   type ConfigScope,
@@ -23,7 +24,6 @@ import {
   writeFailure,
 } from "@cosmicdrift/kumiko-framework/errors";
 import { assertUnreachable } from "@cosmicdrift/kumiko-framework/utils";
-import { eq, isNull } from "drizzle-orm";
 import { ConfigErrors } from "./constants";
 import { configValuesTable } from "./table";
 
@@ -44,15 +44,11 @@ export async function findConfigRow(
   tenantId: TenantId,
   userId: string | null,
 ): Promise<ConfigRowLookup | null> {
-  const userCond =
-    userId !== null ? eq(configValuesTable.userId, userId) : isNull(configValuesTable.userId);
-  const row = await fetchOne<ConfigRowLookup>(
-    db,
-    configValuesTable,
-    eq(configValuesTable.key, key),
-    eq(configValuesTable.tenantId, tenantId),
-    userCond,
-  );
+  const row = await fetchOne<ConfigRowLookup>(db, configValuesTable, {
+    key,
+    tenantId,
+    userId,
+  });
   if (!row) return null;
   return {
     id: row.id,

package/src/custom-fields/__tests__/audit-integration.integration.ts

@@ -10,7 +10,9 @@
 // directly) picks them up automatically. This suite is the evidence that
 // the promise holds end-to-end.
 
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import {
   createEntity,
   createEntityExecutor,
@@ -26,8 +28,6 @@ import {
   TestUsers,
   unsafeCreateEntityTable,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { sql } from "drizzle-orm";
-import { afterAll, beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { z } from "zod";
 import { AuditQueries } from "../../audit/constants";
 import { createAuditFeature } from "../../audit/feature";
@@ -42,7 +42,7 @@ const propertyEntity = createEntity({
     customFields: customFieldsField(),
   },
 });
-const propertyTable = buildDrizzleTable("property", propertyEntity);
+const propertyTable = buildEntityTable("property", propertyEntity);
 
 const propertyFeature = defineFeature("property-t15a", (r) => {
   r.entity("property", propertyEntity);
@@ -92,8 +92,8 @@ afterAll(async () => {
 
 beforeEach(async () => {
   await resetEventStore(stack);
-  await stack.db.execute(sql`DELETE FROM read_t15a_properties`);
-  await stack.db.execute(sql`DELETE FROM read_custom_field_definitions`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_t15a_properties`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_custom_field_definitions`);
 });
 
 type AuditRow = {

package/src/custom-fields/__tests__/custom-fields.integration.ts

@@ -10,7 +10,9 @@
 // Pattern follows cap-counter.integration.ts: probe-feature mit own entity,
 // wired via wireCustomFieldsFor.
 
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import {
   createEntity,
   createEntityExecutor,
@@ -25,8 +27,6 @@ import {
   type TestStack,
   unsafeCreateEntityTable,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { sql } from "drizzle-orm";
-import { afterAll, beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { z } from "zod";
 import { fieldDefinitionEntity } from "../entity";
 import { createCustomFieldsFeature } from "../feature";
@@ -41,7 +41,7 @@ const propertyEntity = createEntity({
     customFields: customFieldsField(),
   },
 });
-const propertyTable = buildDrizzleTable("property", propertyEntity);
+const propertyTable = buildEntityTable("property", propertyEntity);
 
 const propertyFeature = defineFeature("property-test", (r) => {
   r.entity("property", propertyEntity);
@@ -91,9 +91,9 @@ afterAll(async () => {
 
 beforeEach(async () => {
   // Clean slate per test — event-log + entity-rows.
-  await stack.db.execute(sql`DELETE FROM kumiko_events`);
-  await stack.db.execute(sql`DELETE FROM read_t1_properties`);
-  await stack.db.execute(sql`DELETE FROM read_custom_field_definitions`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM kumiko_events`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_t1_properties`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_custom_field_definitions`);
 });
 
 // --- Helpers ---

package/src/custom-fields/__tests__/feature.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "vitest";
+import { describe, expect, test } from "bun:test";
 import { fieldDefinitionAggregateId } from "../aggregate-id";
 import { SUPPORTED_FIELD_TYPES } from "../constants";
 import { createCustomFieldsFeature } from "../feature";

package/src/custom-fields/__tests__/field-access.integration.ts

@@ -9,7 +9,9 @@
 // exactly as in B2 (no extra gate) — the existing roundtrip-test suite
 // stays green, and we add an explicit covers-the-no-op-path test here too.
 
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import {
   createEntity,
   createEntityExecutor,
@@ -24,8 +26,6 @@ import {
   type TestStack,
   unsafeCreateEntityTable,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { sql } from "drizzle-orm";
-import { afterAll, beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { z } from "zod";
 import { fieldDefinitionEntity } from "../entity";
 import { createCustomFieldsFeature } from "../feature";
@@ -38,7 +38,7 @@ const propertyEntity = createEntity({
     customFields: customFieldsField(),
   },
 });
-const propertyTable = buildDrizzleTable("property", propertyEntity);
+const propertyTable = buildEntityTable("property", propertyEntity);
 
 const propertyFeature = defineFeature("property-t15b", (r) => {
   r.entity("property", propertyEntity);
@@ -84,8 +84,8 @@ afterAll(async () => {
 
 beforeEach(async () => {
   await resetEventStore(stack);
-  await stack.db.execute(sql`DELETE FROM read_t15b_properties`);
-  await stack.db.execute(sql`DELETE FROM read_custom_field_definitions`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_t15b_properties`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_custom_field_definitions`);
 });
 
 async function defineField(fieldKey: string, serializedField: Record<string, unknown>) {

package/src/custom-fields/__tests__/quota.integration.ts

@@ -5,7 +5,9 @@
 // rejects with `unprocessable` + reason `cap_exceeded` when the
 // tenant already has >= N definitions.
 
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import {
   createEntity,
   createEntityExecutor,
@@ -20,8 +22,6 @@ import {
   type TestStack,
   unsafeCreateEntityTable,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { sql } from "drizzle-orm";
-import { afterAll, beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { z } from "zod";
 import { fieldDefinitionEntity } from "../entity";
 import { createCustomFieldsFeature } from "../feature";
@@ -34,7 +34,7 @@ const propertyEntity = createEntity({
     customFields: customFieldsField(),
   },
 });
-const propertyTable = buildDrizzleTable("property", propertyEntity);
+const propertyTable = buildEntityTable("property", propertyEntity);
 
 const propertyFeature = defineFeature("property-t15e", (r) => {
   r.entity("property", propertyEntity);
@@ -74,8 +74,8 @@ afterAll(async () => {
 
 beforeEach(async () => {
   await resetEventStore(stack);
-  await stack.db.execute(sql`DELETE FROM read_t15e_properties`);
-  await stack.db.execute(sql`DELETE FROM read_custom_field_definitions`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_t15e_properties`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM read_custom_field_definitions`);
 });
 
 async function defineField(fieldKey: string) {