metal-orm 1.1.11 → 1.1.18

package/src/core/driver/mssql-driver.ts

@@ -1,23 +1,23 @@
-import { DatabaseDriver } from './database-driver.js';
-import { SqlServerDialect } from '../dialect/mssql/index.js';
-import { MSSqlSchemaDialect } from '../ddl/dialects/mssql-schema-dialect.js';
-import { mssqlIntrospector } from '../ddl/introspect/mssql.js';
-
-/**
- * Database driver for Microsoft SQL Server.
- */
-export class MssqlDriver implements DatabaseDriver {
-  readonly name = 'mssql';
-
-  createDialect() {
-    return new SqlServerDialect();
-  }
-
-  createSchemaDialect() {
-    return new MSSqlSchemaDialect();
-  }
-
-  createIntrospector() {
-    return mssqlIntrospector;
-  }
-}
+import { DatabaseDriver } from './database-driver.js';
+import { SqlServerDialect } from '../dialect/mssql/index.js';
+import { MSSqlSchemaDialect } from '../ddl/dialects/mssql-schema-dialect.js';
+import { mssqlIntrospector } from '../ddl/introspect/mssql.js';
+
+/**
+ * Database driver for Microsoft SQL Server.
+ */
+export class MssqlDriver implements DatabaseDriver {
+  readonly name = 'mssql';
+
+  createDialect() {
+    return new SqlServerDialect();
+  }
+
+  createSchemaDialect() {
+    return new MSSqlSchemaDialect();
+  }
+
+  createIntrospector() {
+    return mssqlIntrospector;
+  }
+}

package/src/core/driver/mysql-driver.ts

@@ -1,23 +1,23 @@
-import { DatabaseDriver } from './database-driver.js';
-import { MySqlDialect } from '../dialect/mysql/index.js';
-import { MySqlSchemaDialect } from '../ddl/dialects/mysql-schema-dialect.js';
-import { mysqlIntrospector } from '../ddl/introspect/mysql.js';
-
-/**
- * Database driver for MySQL.
- */
-export class MySqlDriver implements DatabaseDriver {
-  readonly name = 'mysql';
-
-  createDialect() {
-    return new MySqlDialect();
-  }
-
-  createSchemaDialect() {
-    return new MySqlSchemaDialect();
-  }
-
-  createIntrospector() {
-    return mysqlIntrospector;
-  }
-}
+import { DatabaseDriver } from './database-driver.js';
+import { MySqlDialect } from '../dialect/mysql/index.js';
+import { MySqlSchemaDialect } from '../ddl/dialects/mysql-schema-dialect.js';
+import { mysqlIntrospector } from '../ddl/introspect/mysql.js';
+
+/**
+ * Database driver for MySQL.
+ */
+export class MySqlDriver implements DatabaseDriver {
+  readonly name = 'mysql';
+
+  createDialect() {
+    return new MySqlDialect();
+  }
+
+  createSchemaDialect() {
+    return new MySqlSchemaDialect();
+  }
+
+  createIntrospector() {
+    return mysqlIntrospector;
+  }
+}

package/src/core/driver/postgres-driver.ts

@@ -1,23 +1,23 @@
-import { DatabaseDriver } from './database-driver.js';
-import { PostgresDialect } from '../dialect/postgres/index.js';
-import { PostgresSchemaDialect } from '../ddl/dialects/postgres-schema-dialect.js';
-import { postgresIntrospector } from '../ddl/introspect/postgres.js';
-
-/**
- * Database driver for PostgreSQL.
- */
-export class PostgresDriver implements DatabaseDriver {
-  readonly name = 'postgres';
-
-  createDialect() {
-    return new PostgresDialect();
-  }
-
-  createSchemaDialect() {
-    return new PostgresSchemaDialect();
-  }
-
-  createIntrospector() {
-    return postgresIntrospector;
-  }
-}
+import { DatabaseDriver } from './database-driver.js';
+import { PostgresDialect } from '../dialect/postgres/index.js';
+import { PostgresSchemaDialect } from '../ddl/dialects/postgres-schema-dialect.js';
+import { postgresIntrospector } from '../ddl/introspect/postgres.js';
+
+/**
+ * Database driver for PostgreSQL.
+ */
+export class PostgresDriver implements DatabaseDriver {
+  readonly name = 'postgres';
+
+  createDialect() {
+    return new PostgresDialect();
+  }
+
+  createSchemaDialect() {
+    return new PostgresSchemaDialect();
+  }
+
+  createIntrospector() {
+    return postgresIntrospector;
+  }
+}

package/src/core/driver/sqlite-driver.ts

@@ -1,23 +1,23 @@
-import { DatabaseDriver } from './database-driver.js';
-import { SqliteDialect } from '../dialect/sqlite/index.js';
-import { SQLiteSchemaDialect } from '../ddl/dialects/sqlite-schema-dialect.js';
-import { sqliteIntrospector } from '../ddl/introspect/sqlite.js';
-
-/**
- * Database driver for SQLite.
- */
-export class SqliteDriver implements DatabaseDriver {
-  readonly name = 'sqlite';
-
-  createDialect() {
-    return new SqliteDialect();
-  }
-
-  createSchemaDialect() {
-    return new SQLiteSchemaDialect();
-  }
-
-  createIntrospector() {
-    return sqliteIntrospector;
-  }
-}
+import { DatabaseDriver } from './database-driver.js';
+import { SqliteDialect } from '../dialect/sqlite/index.js';
+import { SQLiteSchemaDialect } from '../ddl/dialects/sqlite-schema-dialect.js';
+import { sqliteIntrospector } from '../ddl/introspect/sqlite.js';
+
+/**
+ * Database driver for SQLite.
+ */
+export class SqliteDriver implements DatabaseDriver {
+  readonly name = 'sqlite';
+
+  createDialect() {
+    return new SqliteDialect();
+  }
+
+  createSchemaDialect() {
+    return new SQLiteSchemaDialect();
+  }
+
+  createIntrospector() {
+    return sqliteIntrospector;
+  }
+}

package/src/core/execution/db-executor.ts

@@ -1,33 +1,33 @@
-// src/core/execution/db-executor.ts
-
-// low-level canonical shape
-export type QueryResult = {
-  columns: string[];
-  values: unknown[][];
-  meta?: {
-    insertId?: number | string;
-    rowsAffected?: number;
-  };
-};
-
-/**
- * Canonical execution payload.
- * It remains array-compatible for a gradual migration but always exposes
- * `resultSets` for explicit multi-result handling.
- */
-export type ExecutionPayload = QueryResult[] & {
-  resultSets?: QueryResult[];
-};
-
-export const toExecutionPayload = (resultSets: QueryResult[]): ExecutionPayload => {
-  const payload = resultSets as ExecutionPayload;
-  payload.resultSets = resultSets;
-  return payload;
-};
-
-export const payloadResultSets = (payload: ExecutionPayload): QueryResult[] =>
-  payload.resultSets ?? payload;
-
+// src/core/execution/db-executor.ts
+
+// low-level canonical shape
+export type QueryResult = {
+  columns: string[];
+  values: unknown[][];
+  meta?: {
+    insertId?: number | string;
+    rowsAffected?: number;
+  };
+};
+
+/**
+ * Canonical execution payload.
+ * It remains array-compatible for a gradual migration but always exposes
+ * `resultSets` for explicit multi-result handling.
+ */
+export type ExecutionPayload = QueryResult[] & {
+  resultSets?: QueryResult[];
+};
+
+export const toExecutionPayload = (resultSets: QueryResult[]): ExecutionPayload => {
+  const payload = resultSets as ExecutionPayload;
+  payload.resultSets = resultSets;
+  return payload;
+};
+
+export const payloadResultSets = (payload: ExecutionPayload): QueryResult[] =>
+  payload.resultSets ?? payload;
+
 export interface DbExecutor {
   /** Capability flags so the runtime can make correct decisions without relying on optional methods. */
   readonly capabilities: {
@@ -36,46 +36,46 @@ export interface DbExecutor {
     /** True if savepoint/release/rollback-to-savepoint are implemented. */
     savepoints?: boolean;
   };
-
-  executeSql(sql: string, params?: unknown[]): Promise<ExecutionPayload>;
-
+
+  executeSql(sql: string, params?: unknown[]): Promise<ExecutionPayload>;
+
   beginTransaction(): Promise<void>;
   commitTransaction(): Promise<void>;
   rollbackTransaction(): Promise<void>;
   savepoint?(name: string): Promise<void>;
   releaseSavepoint?(name: string): Promise<void>;
   rollbackToSavepoint?(name: string): Promise<void>;
-
-  /** Release any underlying resources (connections, pool leases, etc). Must be idempotent. */
-  dispose(): Promise<void>;
-}
-
-// --- helpers ---
-
-/**
- * Convert an array of row objects into a QueryResult.
- */
-export function rowsToQueryResult(
-  rows: Array<Record<string, unknown>>
-): QueryResult {
-  if (rows.length === 0) {
-    return { columns: [], values: [] };
-  }
-
-  const columns = Object.keys(rows[0]);
-  const values = rows.map(row => columns.map(c => row[c]));
-  return { columns, values };
-}
-
-/**
- * Minimal contract that most SQL clients can implement.
- */
-export interface SimpleQueryRunner {
-  query(
-    sql: string,
-    params?: unknown[]
-  ): Promise<Array<Record<string, unknown>>>;
-
+
+  /** Release any underlying resources (connections, pool leases, etc). Must be idempotent. */
+  dispose(): Promise<void>;
+}
+
+// --- helpers ---
+
+/**
+ * Convert an array of row objects into a QueryResult.
+ */
+export function rowsToQueryResult(
+  rows: Array<Record<string, unknown>>
+): QueryResult {
+  if (rows.length === 0) {
+    return { columns: [], values: [] };
+  }
+
+  const columns = Object.keys(rows[0]);
+  const values = rows.map(row => columns.map(c => row[c]));
+  return { columns, values };
+}
+
+/**
+ * Minimal contract that most SQL clients can implement.
+ */
+export interface SimpleQueryRunner {
+  query(
+    sql: string,
+    params?: unknown[]
+  ): Promise<Array<Record<string, unknown>>>;
+
   /** Optional: used to support real transactions. */
   beginTransaction?(): Promise<void>;
   commitTransaction?(): Promise<void>;
@@ -83,17 +83,17 @@ export interface SimpleQueryRunner {
   savepoint?(name: string): Promise<void>;
   releaseSavepoint?(name: string): Promise<void>;
   rollbackToSavepoint?(name: string): Promise<void>;
-
-  /** Optional: release resources (connection close, pool lease release, etc). */
-  dispose?(): Promise<void>;
-}
-
-/**
- * Generic factory: turn any SimpleQueryRunner into a DbExecutor.
- */
-export function createExecutorFromQueryRunner(
-  runner: SimpleQueryRunner
-): DbExecutor {
+
+  /** Optional: release resources (connection close, pool lease release, etc). */
+  dispose?(): Promise<void>;
+}
+
+/**
+ * Generic factory: turn any SimpleQueryRunner into a DbExecutor.
+ */
+export function createExecutorFromQueryRunner(
+  runner: SimpleQueryRunner
+): DbExecutor {
   const supportsTransactions =
     typeof runner.beginTransaction === 'function' &&
     typeof runner.commitTransaction === 'function' &&
@@ -109,23 +109,23 @@ export function createExecutorFromQueryRunner(
       transactions: supportsTransactions,
       ...(supportsSavepoints ? { savepoints: true } : {}),
     },
-    async executeSql(sql, params) {
-      const rows = await runner.query(sql, params);
-      const result = rowsToQueryResult(rows);
-      return toExecutionPayload([result]);
-    },
-    async beginTransaction() {
-      if (!supportsTransactions) {
-        throw new Error('Transactions are not supported by this executor');
-      }
-      await runner.beginTransaction!.call(runner);
-    },
-    async commitTransaction() {
-      if (!supportsTransactions) {
-        throw new Error('Transactions are not supported by this executor');
-      }
-      await runner.commitTransaction!.call(runner);
-    },
+    async executeSql(sql, params) {
+      const rows = await runner.query(sql, params);
+      const result = rowsToQueryResult(rows);
+      return toExecutionPayload([result]);
+    },
+    async beginTransaction() {
+      if (!supportsTransactions) {
+        throw new Error('Transactions are not supported by this executor');
+      }
+      await runner.beginTransaction!.call(runner);
+    },
+    async commitTransaction() {
+      if (!supportsTransactions) {
+        throw new Error('Transactions are not supported by this executor');
+      }
+      await runner.commitTransaction!.call(runner);
+    },
     async rollbackTransaction() {
       if (!supportsTransactions) {
         throw new Error('Transactions are not supported by this executor');

package/src/core/execution/executors/better-sqlite3-executor.ts

@@ -1,94 +1,94 @@
-// src/core/execution/executors/better-sqlite3-executor.ts
-import {
-  DbExecutor,
-  toExecutionPayload,
-  rowsToQueryResult,
-  QueryResult
-} from '../db-executor.js';
-
-export interface BetterSqlite3Statement {
-  reader: boolean;
-  all(...params: unknown[]): unknown[];
-  run(...params: unknown[]): { changes: number; lastInsertRowid: number | bigint };
-}
-
+// src/core/execution/executors/better-sqlite3-executor.ts
+import {
+  DbExecutor,
+  toExecutionPayload,
+  rowsToQueryResult,
+  QueryResult
+} from '../db-executor.js';
+
+export interface BetterSqlite3Statement {
+  reader: boolean;
+  all(...params: unknown[]): unknown[];
+  run(...params: unknown[]): { changes: number; lastInsertRowid: number | bigint };
+}
+
 export interface BetterSqlite3ClientLike {
   prepare(sql: string): BetterSqlite3Statement;
   transaction<T extends (...args: unknown[]) => unknown>(fn: T): T;
 }
-
-const SAVEPOINT_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
-
-const sanitizeSavepointName = (name: string): string => {
-  const trimmed = name.trim();
-  if (!SAVEPOINT_NAME_PATTERN.test(trimmed)) {
-    throw new Error(`Invalid savepoint name: "${name}"`);
-  }
-  return trimmed;
-};
-
-/**
- * Creates a database executor for better-sqlite3.
- * @param client A better-sqlite3 database instance.
- * @returns A DbExecutor implementation for better-sqlite3.
- */
-export function createBetterSqlite3Executor(
-  client: BetterSqlite3ClientLike
-): DbExecutor {
-  // better-sqlite3 handles nested transactions using savepoints automatically
-  // when using .transaction(), but DbExecutor needs explicit control.
-
-  return {
-    capabilities: {
-      transactions: true,
-      savepoints: true,
-    },
-    async executeSql(sql, params) {
-      const stmt = client.prepare(sql);
-      let result: QueryResult;
-
-      if (stmt.reader) {
-        const rows = stmt.all(...(params ?? [])) as Record<string, unknown>[];
-        result = rowsToQueryResult(rows);
-      } else {
-        const info = stmt.run(...(params ?? []));
-        result = {
-          columns: [],
-          values: [],
-          meta: {
-            rowsAffected: info.changes,
-            insertId: typeof info.lastInsertRowid === 'bigint'
-              ? info.lastInsertRowid.toString()
-              : info.lastInsertRowid
-          }
-        };
-      }
-
-      return toExecutionPayload([result]);
-    },
-    async beginTransaction() {
-      client.prepare('BEGIN').run();
-    },
-    async commitTransaction() {
-      client.prepare('COMMIT').run();
-    },
-    async rollbackTransaction() {
-      client.prepare('ROLLBACK').run();
-    },
-    async savepoint(name: string) {
-      const savepoint = sanitizeSavepointName(name);
-      client.prepare(`SAVEPOINT ${savepoint}`).run();
-    },
-    async releaseSavepoint(name: string) {
-      const savepoint = sanitizeSavepointName(name);
-      client.prepare(`RELEASE SAVEPOINT ${savepoint}`).run();
-    },
-    async rollbackToSavepoint(name: string) {
-      const savepoint = sanitizeSavepointName(name);
-      client.prepare(`ROLLBACK TO SAVEPOINT ${savepoint}`).run();
-    },
-    async dispose() {
-      // Connection lifecycle is owned by the caller.
-    },
-  };
-}
+
+const SAVEPOINT_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+
+const sanitizeSavepointName = (name: string): string => {
+  const trimmed = name.trim();
+  if (!SAVEPOINT_NAME_PATTERN.test(trimmed)) {
+    throw new Error(`Invalid savepoint name: "${name}"`);
+  }
+  return trimmed;
+};
+
+/**
+ * Creates a database executor for better-sqlite3.
+ * @param client A better-sqlite3 database instance.
+ * @returns A DbExecutor implementation for better-sqlite3.
+ */
+export function createBetterSqlite3Executor(
+  client: BetterSqlite3ClientLike
+): DbExecutor {
+  // better-sqlite3 handles nested transactions using savepoints automatically
+  // when using .transaction(), but DbExecutor needs explicit control.
+
+  return {
+    capabilities: {
+      transactions: true,
+      savepoints: true,
+    },
+    async executeSql(sql, params) {
+      const stmt = client.prepare(sql);
+      let result: QueryResult;
+
+      if (stmt.reader) {
+        const rows = stmt.all(...(params ?? [])) as Record<string, unknown>[];
+        result = rowsToQueryResult(rows);
+      } else {
+        const info = stmt.run(...(params ?? []));
+        result = {
+          columns: [],
+          values: [],
+          meta: {
+            rowsAffected: info.changes,
+            insertId: typeof info.lastInsertRowid === 'bigint'
+              ? info.lastInsertRowid.toString()
+              : info.lastInsertRowid
+          }
+        };
+      }
+
+      return toExecutionPayload([result]);
+    },
+    async beginTransaction() {
+      client.prepare('BEGIN').run();
+    },
+    async commitTransaction() {
+      client.prepare('COMMIT').run();
+    },
+    async rollbackTransaction() {
+      client.prepare('ROLLBACK').run();
+    },
+    async savepoint(name: string) {
+      const savepoint = sanitizeSavepointName(name);
+      client.prepare(`SAVEPOINT ${savepoint}`).run();
+    },
+    async releaseSavepoint(name: string) {
+      const savepoint = sanitizeSavepointName(name);
+      client.prepare(`RELEASE SAVEPOINT ${savepoint}`).run();
+    },
+    async rollbackToSavepoint(name: string) {
+      const savepoint = sanitizeSavepointName(name);
+      client.prepare(`ROLLBACK TO SAVEPOINT ${savepoint}`).run();
+    },
+    async dispose() {
+      // Connection lifecycle is owned by the caller.
+    },
+  };
+}