@telorun/sql 0.8.0 → 0.10.0

package/dist/sql-selection-controller.js

@@ -19,21 +19,24 @@ class SqlSelectionResource {
         const having = ctx.expandValue(m.having ?? [], expandCtx);
         const limit = m.limit != null ? ctx.expandValue(m.limit, expandCtx) : undefined;
         const offset = m.offset != null ? ctx.expandValue(m.offset, expandCtx) : undefined;
-        const connection = resolveSqlConnection(m.connection, ctx) ?? m.transaction?.getConnection();
+        const connection = resolveSqlConnection(m.connection, ctx, () => `Sql.Selection "${m.metadata.name}": 'connection'`) ??
+            m.transaction?.getConnection();
         if (!connection) {
             throw new Error("Sql.Selection: either 'connection' or 'transaction' must be set");
         }
-        const { sql, params } = buildSelect(m, where, having, limit, offset, connection.driver);
+        const { sql, params } = buildSelect(m, where, having, limit, offset, connection.dialect);
         const result = await connection.execute(sql, params, m.transaction);
         return { rows: result.rows, rowCount: result.rows.length };
     }
 }
-function buildSelect(m, where, having, limit, offset, driver) {
+// ── SQL building ──────────────────────────────────────────────────────────────
+function buildSelect(m, where, having, limit, offset, dialect) {
     const params = [];
     const addParam = (value) => {
         params.push(value);
-        return `$${params.length}`;
+        return dialect.placeholderStyle === "numbered" ? `$${params.length}` : "?";
     };
+    const quoteIdent = (name) => dialect.quoteIdentifier(name);
     const parts = [];
     // SELECT [DISTINCT [ON (...)]]
     let selectClause = "SELECT";
@@ -43,12 +46,12 @@ function buildSelect(m, where, having, limit, offset, driver) {
     else if (m.distinctOn && m.distinctOn.length > 0) {
         selectClause += ` DISTINCT ON (${m.distinctOn.map(quoteIdent).join(", ")})`;
     }
-    const colList = m.columns && m.columns.length > 0 ? buildColumns(m.columns) : "*";
+    const colList = m.columns && m.columns.length > 0 ? buildColumns(m.columns, dialect) : "*";
     parts.push(`${selectClause} ${colList}`);
     // FROM
     parts.push(`FROM ${quoteIdent(m.from)}`);
     // WHERE
-    const whereStr = buildClauses(where, "AND", driver, addParam);
+    const whereStr = buildClauses(where, "AND", dialect, addParam);
     if (whereStr)
         parts.push(`WHERE ${whereStr}`);
     // GROUP BY
@@ -56,7 +59,7 @@ function buildSelect(m, where, having, limit, offset, driver) {
         parts.push(`GROUP BY ${m.groupBy.map(quoteIdent).join(", ")}`);
     }
     // HAVING
-    const havingStr = buildClauses(having, "AND", driver, addParam);
+    const havingStr = buildClauses(having, "AND", dialect, addParam);
     if (havingStr)
         parts.push(`HAVING ${havingStr}`);
     // ORDER BY
@@ -71,7 +74,8 @@ function buildSelect(m, where, having, limit, offset, driver) {
         parts.push(`OFFSET ${addParam(offset)}`);
     return { sql: parts.join("\n"), params };
 }
-function buildColumns(columns) {
+function buildColumns(columns, dialect) {
+    const quoteIdent = (name) => dialect.quoteIdentifier(name);
     return columns
         .map((c) => {
         if (typeof c === "string")
@@ -82,12 +86,12 @@ function buildColumns(columns) {
     })
         .join(", ");
 }
-function buildClauses(clauses, join, driver, addParam) {
+function buildClauses(clauses, join, dialect, addParam) {
     const parts = [];
     for (const clause of clauses) {
         if (clause.when === false)
             continue;
-        const built = buildClause(clause, driver, addParam);
+        const built = buildClause(clause, dialect, addParam);
         if (built !== null)
             parts.push(built);
     }
@@ -97,43 +101,38 @@ function buildClauses(clauses, join, driver, addParam) {
         return parts[0];
     return parts.join(` ${join} `);
 }
-function buildClause(node, driver, addParam) {
+function buildClause(node, dialect, addParam) {
     if ("not" in node) {
-        const inner = buildClause(node.not, driver, addParam);
+        const inner = buildClause(node.not, dialect, addParam);
         return inner ? `NOT (${inner})` : null;
     }
     if ("or" in node) {
-        const inner = buildClauses(node.or, "OR", driver, addParam);
+        const inner = buildClauses(node.or, "OR", dialect, addParam);
         return inner ? `(${inner})` : null;
     }
     if ("and" in node) {
-        const inner = buildClauses(node.and, "AND", driver, addParam);
+        const inner = buildClauses(node.and, "AND", dialect, addParam);
         return inner ? `(${inner})` : null;
     }
     if ("sql" in node) {
         return renumberFragment(node.sql, node.bindings ?? [], addParam);
     }
     if ("column" in node) {
-        return buildCondition(node, driver, addParam);
+        return buildCondition(node, dialect, addParam);
     }
     return null;
 }
-function buildCondition(c, driver, addParam) {
-    const col = quoteIdent(c.column);
+function buildCondition(c, dialect, addParam) {
+    const col = dialect.quoteIdentifier(c.column);
     switch (c.op) {
         case "is_null":
             return `${col} IS NULL`;
         case "is_not_null":
             return `${col} IS NOT NULL`;
-        case "in": {
-            if (driver === "postgres") {
-                return `${col} = ANY(${addParam(c.value)})`;
-            }
-            const placeholders = c.value.map((v) => addParam(v)).join(", ");
-            return `${col} IN (${placeholders})`;
-        }
+        case "in":
+            return dialect.renderIn(col, c.value, addParam);
         default: {
-            const rhs = c.ref !== undefined ? quoteIdent(c.ref) : addParam(c.value);
+            const rhs = c.ref !== undefined ? dialect.quoteIdentifier(c.ref) : addParam(c.value);
             return `${col} ${opToSql(c.op)} ${rhs}`;
         }
     }
@@ -141,9 +140,6 @@ function buildCondition(c, driver, addParam) {
 function renumberFragment(sql, bindings, addParam) {
     return sql.replace(/\$(\d+)/g, (_, idx) => addParam(bindings[Number(idx) - 1]));
 }
-function quoteIdent(name) {
-    return `"${name.replace(/"/g, '""')}"`;
-}
 function opToSql(op) {
     const map = {
         eq: "=",

package/dist/sql-transaction-controller.d.ts

@@ -1,11 +1,11 @@
 import type { Invocable, ResourceContext, ResourceInstance } from "@telorun/sdk";
-import type { SqlConnectionResource } from "./sql-connection-controller.js";
+import type { SqlConnection } from "./sql-connection.js";
 interface SqlTransactionManifest {
     metadata: {
         name: string;
         module: string;
     };
-    connection: SqlConnectionResource;
+    connection: SqlConnection;
     steps: Invocable;
     inputs?: Record<string, unknown>;
 }
@@ -13,7 +13,7 @@ export declare class SqlTransactionResource implements ResourceInstance {
     private readonly manifest;
     private readonly ctx;
     constructor(manifest: SqlTransactionManifest, ctx: ResourceContext);
-    getConnection(): SqlConnectionResource;
+    getConnection(): SqlConnection;
     assertActive(): void;
     invoke(input: unknown): Promise<unknown>;
 }

package/dist/sql-transaction-controller.js

@@ -8,8 +8,7 @@ export class SqlTransactionResource {
         this.ctx = ctx;
     }
     getConnection() {
-        return (resolveSqlConnection(this.manifest.connection, this.ctx) ??
-            failMissingConnection(this.manifest.metadata.name));
+        return (resolveSqlConnection(this.manifest.connection, this.ctx, () => `Sql.Transaction "${this.manifest.metadata.name}": 'connection'`) ?? failMissingConnection(this.manifest.metadata.name));
     }
     assertActive() {
         if (!currentTxId()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/sql",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Telo SQL module - SQL database resource kinds for Telo manifests.",
   "keywords": [
     "telo",
@@ -30,11 +30,6 @@
       "bun": "./src/index.ts",
       "import": "./dist/index.js"
     },
-    "./connection": {
-      "types": "./dist/sql-connection-controller.d.ts",
-      "bun": "./src/sql-connection-controller.ts",
-      "import": "./dist/sql-connection-controller.js"
-    },
     "./sql-query": {
       "bun": "./src/sql-query-controller.ts",
       "import": "./dist/sql-query-controller.js"
@@ -70,7 +65,7 @@
   "devDependencies": {
     "@types/node": "^20.0.0",
     "typescript": "^5.0.0",
-    "@telorun/sdk": "0.34.0"
+    "@telorun/sdk": "0.58.0"
   },
   "peerDependencies": {
     "@telorun/sdk": "*"

package/src/index.ts

@@ -1,8 +1,8 @@
+export { SqlConnectionBase } from "./sql-connection-base.js";
 export {
-  SqlConnectionResource,
-  createSqlConnection,
-  type SqlDriver,
+  quoteAnsiIdentifier,
   type PlaceholderStyle,
-} from "./sql-connection-controller.js";
-export { resolveSqlConnection } from "./sql-connection-ref.js";
-export type { SqliteDb, SqliteStatement } from "./sqlite-driver-interface.js";
+  type SqlConnection,
+  type SqlDialect,
+} from "./sql-connection.js";
+export { isSqlConnection, resolveSqlConnection } from "./sql-connection-ref.js";

package/src/sql-command-controller.ts

@@ -1,5 +1,5 @@
 import type { ResourceContext, ResourceInstance } from "@telorun/sdk";
-import type { SqlConnectionResource } from "./sql-connection-controller.js";
+import type { SqlConnection } from "./sql-connection.js";
 import { resolveSqlConnection } from "./sql-connection-ref.js";
 import type { SqlResult } from "./sql-query-controller.js";
 import { runSql } from "./sql-run.js";
@@ -7,7 +7,7 @@ import type { SqlTransactionResource } from "./sql-transaction-controller.js";
 
 interface SqlCommandManifest {
   metadata: { name: string; module: string };
-  connection?: SqlConnectionResource;
+  connection?: SqlConnection;
   transaction?: SqlTransactionResource;
   inputs: {
     sql: string;
@@ -25,7 +25,9 @@ class SqlCommandResource implements ResourceInstance {
     const m = this.manifest;
     const ctx = this.ctx;
 
-    const connection = resolveSqlConnection(m.connection, ctx) ?? m.transaction?.getConnection();
+    const connection =
+      resolveSqlConnection(m.connection, ctx, () => `Sql.Command "${m.metadata.name}": 'connection'`) ??
+      m.transaction?.getConnection();
     if (!connection) {
       throw new Error("Sql: either 'connection' or 'transaction' must be set");
     }

package/src/{sql-connection-controller.ts → sql-connection-base.ts}

@@ -1,37 +1,32 @@
-import type { ResourceInstance } from "@telorun/sdk";
 import { randomUUID } from "crypto";
-import { CompiledQuery, Kysely, type QueryResult, type Transaction } from "kysely";
+import { CompiledQuery, type Kysely, type QueryResult, type Transaction } from "kysely";
+import type { SqlConnection, SqlDialect } from "./sql-connection.js";
 import type { SqlTransactionResource } from "./sql-transaction-controller.js";
-import type { SqliteDb } from "./sqlite-driver-interface.js";
 import { currentTxId, deleteTx, getTx, setTx, txStorage } from "./transaction-store.js";
 
-export type SqlDriver = "postgres" | "sqlite";
-
-/** Native bind-placeholder syntax per driver: SQLite binds anonymous `?`,
- *  PostgreSQL binds numbered `$1`, `$2`, … */
-export type PlaceholderStyle = "qmark" | "numbered";
-
 /**
- * Driver-agnostic SQL connection. The kysely instance (and, for SQLite, the
- * underlying database handle used by `executeScript`) is built by the driver
- * backend (`sql-postgres`, `sql-sqlite`) and handed in via
- * {@link createSqlConnection}. Everything here — execution, transactions,
- * placeholder style, row-count normalization — is transport-neutral.
+ * The dialect-neutral half of a connection: statement execution, transaction
+ * scoping, template binding and row-count normalization over a kysely instance.
+ *
+ * Backends extend it, supply their {@link SqlDialect}, and override only what is
+ * genuinely theirs — `teardown` for resources kysely does not own, `executeScript`
+ * where the driver has a native multi-statement path.
  */
-export class SqlConnectionResource implements ResourceInstance {
-  private readonly db: Kysely<any>;
-  private readonly sqlite?: SqliteDb;
+export abstract class SqlConnectionBase implements SqlConnection {
+  protected readonly db: Kysely<any>;
 
   constructor(
-    readonly driver: SqlDriver,
     db: Kysely<any>,
-    sqlite?: SqliteDb,
+    readonly dialect: SqlDialect,
   ) {
     this.db = db;
-    this.sqlite = sqlite;
   }
 
-  async init() {
+  get kysely(): Kysely<any> {
+    return this.db;
+  }
+
+  async init(): Promise<void> {
     await this.db.connection().execute(async () => {
       // just checking
     });
@@ -63,13 +58,6 @@ export class SqlConnectionResource implements ResourceInstance {
     return executor.executeQuery<T>(CompiledQuery.raw(sql, params));
   }
 
-  get placeholderStyle(): PlaceholderStyle {
-    return this.driver === "postgres" ? "numbered" : "qmark";
-  }
-
-  /** Assemble SQL from literal fragments by interleaving driver-native
-   *  placeholders, then bind `values` positionally. `fragments.length` must
-   *  equal `values.length + 1`. */
   async executeTemplate<T>(
     fragments: string[],
     values: unknown[],
@@ -82,16 +70,9 @@ export class SqlConnectionResource implements ResourceInstance {
     return this.execute<T>(sql, values, transaction);
   }
 
-  private placeholder(index: number): string {
-    return this.placeholderStyle === "numbered" ? `$${index}` : "?";
-  }
-
+  /** Hand the whole script to the driver as one statement. Backends whose driver
+   *  needs a dedicated multi-statement entry point override this. */
   async executeScript(sql: string): Promise<void> {
-    if (this.driver === "sqlite") {
-      this.sqlite?.exec(sql);
-      return;
-    }
-
     await this.execute(sql);
   }
 
@@ -103,14 +84,14 @@ export class SqlConnectionResource implements ResourceInstance {
     return result.rows.length;
   }
 
-  get kysely(): Kysely<any> {
-    return this.db;
-  }
-
   snapshot(): Record<string, unknown> {
     return {};
   }
 
+  private placeholder(index: number): string {
+    return this.dialect.placeholderStyle === "numbered" ? `$${index}` : "?";
+  }
+
   private resolveExecutor(transaction?: SqlTransactionResource): Kysely<any> {
     if (transaction) {
       transaction.assertActive();
@@ -127,17 +108,3 @@ export class SqlConnectionResource implements ResourceInstance {
     return this.db;
   }
 }
-
-/**
- * Build a connection from a driver-constructed kysely instance. Driver backends
- * (`sql-postgres`, `sql-sqlite`) own dialect construction and call this; the
- * `sqlite` handle is required only for SQLite (its `executeScript` runs through
- * the native handle).
- */
-export function createSqlConnection(
-  driver: SqlDriver,
-  db: Kysely<any>,
-  sqlite?: SqliteDb,
-): SqlConnectionResource {
-  return new SqlConnectionResource(driver, db, sqlite);
-}

package/src/sql-connection-ref.ts

@@ -1,41 +1,22 @@
-import type { ResourceContext } from "@telorun/sdk";
-import type { SqlConnectionResource } from "./sql-connection-controller.js";
+import type { KindRef, ResourceContext } from "@telorun/sdk";
+import type { SqlConnection } from "./sql-connection.js";
 
-interface ConnectionRef {
-  name: string;
-  alias?: string;
+/** True when a value already exposes the connection contract (Phase-5 injected). */
+export function isSqlConnection(value: unknown): value is SqlConnection {
+  return typeof (value as SqlConnection | undefined)?.execute === "function";
 }
 
+/**
+ * Resolve a `connection` `!ref` field to a live connection. The slot is optional
+ * — an unset one yields `undefined` so the caller can fall back to a `transaction`
+ * — but a slot that IS set must resolve. `describe` names the owning resource and
+ * slot, so the failure points at a concrete manifest location.
+ */
 export function resolveSqlConnection(
-  value: SqlConnectionResource | ConnectionRef | undefined,
+  value: SqlConnection | KindRef<SqlConnection> | undefined,
   ctx: ResourceContext,
-): SqlConnectionResource | undefined {
-  if (!value) {
-    return undefined;
-  }
-
-  if (typeof (value as SqlConnectionResource).execute === "function") {
-    return value as SqlConnectionResource;
-  }
-
-  const ref = value as ConnectionRef;
-  if (typeof ref.name !== "string") {
-    throw new Error("Sql: invalid connection reference");
-  }
-
-  // Cross-module reference (`!ref Alias.Connection`): a connection resolved
-  // inside a nested library is not Phase-5-injected, so the controller receives
-  // the raw `{name, alias}` ref and must route through the import's exported
-  // scope rather than a bare local lookup.
-  if (ref.alias && ref.alias !== "Self") {
-    const instance = ctx.moduleContext.resolveImportedInstance(ref.alias, ref.name);
-    if (typeof (instance as SqlConnectionResource | undefined)?.execute !== "function") {
-      throw new Error(
-        `Sql: connection reference '${ref.alias}.${ref.name}' did not resolve to an exported connection instance.`,
-      );
-    }
-    return instance as unknown as SqlConnectionResource;
-  }
-
-  return ctx.moduleContext.getInstance(ref.name) as SqlConnectionResource;
+  describe: () => string,
+): SqlConnection | undefined {
+  if (!value) return undefined;
+  return ctx.resolveRef(value, isSqlConnection, describe, "std/sql#Connection");
 }

package/src/sql-connection.ts

@@ -0,0 +1,71 @@
+import type { ResourceInstance } from "@telorun/sdk";
+import type { Kysely, QueryResult } from "kysely";
+import type { SqlTransactionResource } from "./sql-transaction-controller.js";
+
+/** Native bind-placeholder syntax: SQLite binds anonymous `?`, PostgreSQL binds
+ *  numbered `$1`, `$2`, … */
+export type PlaceholderStyle = "qmark" | "numbered";
+
+/**
+ * Renders the SQL constructs that differ between database dialects. A backend
+ * supplies one; the `Sql.*` operations build statements through it and never
+ * branch on which database sits behind the connection.
+ */
+export interface SqlDialect {
+  readonly placeholderStyle: PlaceholderStyle;
+
+  /** Quote an identifier — table, column, alias. */
+  quoteIdentifier(name: string): string;
+
+  /** Render set membership. Dialects disagree: PostgreSQL binds the whole array
+   *  to a single placeholder, SQLite binds one per element. `column` arrives
+   *  already quoted. */
+  renderIn(
+    column: string,
+    values: unknown[],
+    addParam: (value: unknown) => string,
+  ): string;
+}
+
+/** ANSI identifier quoting (`"name"`), for the dialects that follow the standard. */
+export function quoteAnsiIdentifier(name: string): string {
+  return `"${name.replace(/"/g, '""')}"`;
+}
+
+/**
+ * The contract every SQL backend satisfies and every `Sql.*` operation programs
+ * against. Backends (`sql-postgres`, `sql-sqlite`) own their own implementation
+ * — usually by extending {@link SqlConnectionBase} — so nothing in this module
+ * knows which databases exist.
+ */
+export interface SqlConnection extends ResourceInstance {
+  readonly dialect: SqlDialect;
+
+  /** The underlying kysely instance, when the backend is built on one —
+   *  {@link SqlConnectionBase} always provides it. Optional because the contract
+   *  must stay implementable by a driver kysely does not support; a consumer
+   *  that needs it (`Sql.Migrations`) checks and fails with a clear message. */
+  readonly kysely?: Kysely<any>;
+
+  execute<T>(
+    sql: string,
+    params?: unknown[],
+    transaction?: SqlTransactionResource,
+  ): Promise<QueryResult<T>>;
+
+  /** Assemble SQL from literal fragments by interleaving dialect-native
+   *  placeholders, then bind `values` positionally. */
+  executeTemplate<T>(
+    fragments: string[],
+    values: unknown[],
+    transaction?: SqlTransactionResource,
+  ): Promise<QueryResult<T>>;
+
+  /** Run a multi-statement script. */
+  executeScript(sql: string): Promise<void>;
+
+  transaction<T>(cb: () => Promise<T>): Promise<T>;
+
+  /** Rows affected by a write, normalized across drivers. */
+  toRowCount(result: QueryResult<unknown>): number;
+}

package/src/sql-migrations-controller.ts

@@ -6,7 +6,7 @@ import {
   type Migration,
   type MigrationProvider,
 } from "kysely";
-import type { SqlConnectionResource } from "./sql-connection-controller.js";
+import type { SqlConnection } from "./sql-connection.js";
 import { resolveSqlConnection } from "./sql-connection-ref.js";
 
 // A migration entry is one statement or an ordered list of statements; both
@@ -18,7 +18,7 @@ interface MigrationEntry {
 
 interface SqlMigrationsManifest {
   metadata: { name: string; module: string };
-  connection: SqlConnectionResource;
+  connection: SqlConnection;
   migrations?: Record<string, MigrationEntry>;
 }
 
@@ -56,7 +56,11 @@ class SqlMigrationsResource implements ResourceInstance {
 
   async run(): Promise<void> {
     const conn =
-      resolveSqlConnection(this.manifest.connection, this.ctx) ?? failMissingConnection();
+      resolveSqlConnection(
+        this.manifest.connection,
+        this.ctx,
+        () => `Sql.Migrations "${this.manifest.metadata.name}": 'connection'`,
+      ) ?? failMissingConnection();
 
     const migrations: Record<string, string[]> = {};
     // Legacy: standalone `Sql.Migration` resources in the same module scope.
@@ -78,6 +82,14 @@ class SqlMigrationsResource implements ResourceInstance {
       migrations[name] = statements;
     }
 
+    if (!conn.kysely) {
+      throw new Error(
+        `Sql.Migrations '${this.manifest.metadata.name}': the referenced connection is not ` +
+          `built on kysely, which this kind's migration runner requires. Use a backend that ` +
+          `extends SqlConnectionBase, or run the statements through Sql.Command.`,
+      );
+    }
+
     const migrator = new Migrator({
       db: conn.kysely,
       provider: new TeloMigrationProvider(migrations),

package/src/sql-query-controller.ts

@@ -1,12 +1,12 @@
 import type { ResourceContext, ResourceInstance } from "@telorun/sdk";
-import type { SqlConnectionResource } from "./sql-connection-controller.js";
+import type { SqlConnection } from "./sql-connection.js";
 import { resolveSqlConnection } from "./sql-connection-ref.js";
 import { runSql } from "./sql-run.js";
 import type { SqlTransactionResource } from "./sql-transaction-controller.js";
 
 interface SqlQueryManifest {
   metadata: { name: string; module: string };
-  connection?: SqlConnectionResource;
+  connection?: SqlConnection;
   transaction?: SqlTransactionResource;
   inputs: {
     sql: string;
@@ -28,19 +28,27 @@ class SqlQueryResource implements ResourceInstance {
   async invoke(input: unknown): Promise<SqlResult> {
     const m = this.manifest;
     const ctx = this.ctx;
-    const connection = resolveConnection(m.connection, m.transaction, ctx);
+    const connection = resolveConnection(
+      m.connection,
+      m.transaction,
+      ctx,
+      () => `Sql.Query "${m.metadata.name}": 'connection'`,
+    );
     const result = await runSql(connection, m.transaction, input, ctx);
     return { rows: result.rows, rowCount: result.rows.length };
   }
 }
 
 function resolveConnection(
-  connection: SqlConnectionResource | undefined,
+  connection: SqlConnection | undefined,
   transaction: SqlTransactionResource | undefined,
   ctx: ResourceContext,
-): SqlConnectionResource {
+  describe: () => string,
+): SqlConnection {
   return (
-    resolveSqlConnection(connection, ctx) ?? transaction?.getConnection() ?? failMissingConnection()
+    resolveSqlConnection(connection, ctx, describe) ??
+    transaction?.getConnection() ??
+    failMissingConnection()
   );
 }
 

package/src/sql-run.ts

@@ -1,6 +1,6 @@
 import { InvokeError, isParameterizedSql, type ResourceContext } from "@telorun/sdk";
 import type { QueryResult } from "kysely";
-import type { SqlConnectionResource } from "./sql-connection-controller.js";
+import type { SqlConnection } from "./sql-connection.js";
 import type { SqlTransactionResource } from "./sql-transaction-controller.js";
 
 /** Execute the `sql` input of a Query/Exec resource against `connection`.
@@ -15,7 +15,7 @@ import type { SqlTransactionResource } from "./sql-transaction-controller.js";
  *  Mixing a `!sql` template with `bindings` is rejected. A plain string `sql`
  *  with neither is executed verbatim. */
 export async function runSql(
-  connection: SqlConnectionResource,
+  connection: SqlConnection,
   transaction: SqlTransactionResource | undefined,
   input: unknown,
   ctx: ResourceContext,