metal-orm 1.0.14 → 1.0.15

package/src/orm/unit-of-work.ts

@@ -1,11 +1,11 @@
-import { ColumnNode, eq } from '../core/ast/expression.js';
-import type { Dialect, CompiledQuery } from '../core/dialect/abstract.js';
+import { ColumnNode, eq } from '../core/ast/expression.js';
+import type { Dialect, CompiledQuery } from '../core/dialect/abstract.js';
 import { InsertQueryBuilder } from '../query-builder/insert.js';
 import { UpdateQueryBuilder } from '../query-builder/update.js';
 import { DeleteQueryBuilder } from '../query-builder/delete.js';
 import { findPrimaryKey } from '../query-builder/hydration-planner.js';
 import type { TableDef, TableHooks } from '../schema/table.js';
-import type { DbExecutor, QueryResult } from './db-executor.js';
+import type { DbExecutor, QueryResult } from '../core/execution/db-executor.js';
 import { IdentityMap } from './identity-map.js';
 import { EntityStatus } from './runtime-types.js';
 import type { TrackedEntity } from './runtime-types.js';
@@ -120,14 +120,14 @@ export class UnitOfWork {
   private async flushInsert(tracked: TrackedEntity): Promise<void> {
     await this.runHook(tracked.table.hooks?.beforeInsert, tracked);
 
-    const payload = this.extractColumns(tracked.table, tracked.entity);
-    let builder = new InsertQueryBuilder(tracked.table).values(payload);
-    if (this.dialect.supportsReturning()) {
-      builder = builder.returning(...this.getReturningColumns(tracked.table));
-    }
-    const compiled = builder.compile(this.dialect);
-    const results = await this.executeCompiled(compiled);
-    this.applyReturningResults(tracked, results);
+    const payload = this.extractColumns(tracked.table, tracked.entity);
+    let builder = new InsertQueryBuilder(tracked.table).values(payload);
+    if (this.dialect.supportsReturning()) {
+      builder = builder.returning(...this.getReturningColumns(tracked.table));
+    }
+    const compiled = builder.compile(this.dialect);
+    const results = await this.executeCompiled(compiled);
+    this.applyReturningResults(tracked, results);
 
     tracked.status = EntityStatus.Managed;
     tracked.original = this.createSnapshot(tracked.table, tracked.entity);
@@ -150,17 +150,17 @@ export class UnitOfWork {
     const pkColumn = tracked.table.columns[findPrimaryKey(tracked.table)];
     if (!pkColumn) return;
 
-    let builder = new UpdateQueryBuilder(tracked.table)
-      .set(changes)
-      .where(eq(pkColumn, tracked.pk));
-
-    if (this.dialect.supportsReturning()) {
-      builder = builder.returning(...this.getReturningColumns(tracked.table));
-    }
-
-    const compiled = builder.compile(this.dialect);
-    const results = await this.executeCompiled(compiled);
-    this.applyReturningResults(tracked, results);
+    let builder = new UpdateQueryBuilder(tracked.table)
+      .set(changes)
+      .where(eq(pkColumn, tracked.pk));
+
+    if (this.dialect.supportsReturning()) {
+      builder = builder.returning(...this.getReturningColumns(tracked.table));
+    }
+
+    const compiled = builder.compile(this.dialect);
+    const results = await this.executeCompiled(compiled);
+    this.applyReturningResults(tracked, results);
 
     tracked.status = EntityStatus.Managed;
     tracked.original = this.createSnapshot(tracked.table, tracked.entity);
@@ -215,44 +215,44 @@ export class UnitOfWork {
     return payload;
   }
 
-  private async executeCompiled(compiled: CompiledQuery): Promise<QueryResult[]> {
-    return this.executor.executeSql(compiled.sql, compiled.params);
-  }
-
-  private getReturningColumns(table: TableDef): ColumnNode[] {
-    return Object.values(table.columns).map(column => ({
-      type: 'Column',
-      table: table.name,
-      name: column.name,
-      alias: column.name
-    }));
-  }
-
-  private applyReturningResults(tracked: TrackedEntity, results: QueryResult[]): void {
-    if (!this.dialect.supportsReturning()) return;
-    const first = results[0];
-    if (!first || first.values.length === 0) return;
-
-    const row = first.values[0];
-    for (let i = 0; i < first.columns.length; i++) {
-      const columnName = this.normalizeColumnName(first.columns[i]);
-      if (!(columnName in tracked.table.columns)) continue;
-      tracked.entity[columnName] = row[i];
-    }
-  }
-
-  private normalizeColumnName(column: string): string {
-    const parts = column.split('.');
-    const candidate = parts[parts.length - 1];
-    return candidate.replace(/^["`[\]]+|["`[\]]+$/g, '');
-  }
-
-  private registerIdentity(tracked: TrackedEntity): void {
-    if (tracked.pk == null) return;
-    this.identityMap.register(tracked);
-  }
-
-  private createSnapshot(table: TableDef, entity: any): Record<string, any> {
+  private async executeCompiled(compiled: CompiledQuery): Promise<QueryResult[]> {
+    return this.executor.executeSql(compiled.sql, compiled.params);
+  }
+
+  private getReturningColumns(table: TableDef): ColumnNode[] {
+    return Object.values(table.columns).map(column => ({
+      type: 'Column',
+      table: table.name,
+      name: column.name,
+      alias: column.name
+    }));
+  }
+
+  private applyReturningResults(tracked: TrackedEntity, results: QueryResult[]): void {
+    if (!this.dialect.supportsReturning()) return;
+    const first = results[0];
+    if (!first || first.values.length === 0) return;
+
+    const row = first.values[0];
+    for (let i = 0; i < first.columns.length; i++) {
+      const columnName = this.normalizeColumnName(first.columns[i]);
+      if (!(columnName in tracked.table.columns)) continue;
+      tracked.entity[columnName] = row[i];
+    }
+  }
+
+  private normalizeColumnName(column: string): string {
+    const parts = column.split('.');
+    const candidate = parts[parts.length - 1];
+    return candidate.replace(/^["`[\]]+|["`[\]]+$/g, '');
+  }
+
+  private registerIdentity(tracked: TrackedEntity): void {
+    if (tracked.pk == null) return;
+    this.identityMap.register(tracked);
+  }
+
+  private createSnapshot(table: TableDef, entity: any): Record<string, any> {
     const snapshot: Record<string, any> = {};
     for (const column of Object.keys(table.columns)) {
       snapshot[column] = entity[column];

package/src/query-builder/delete.ts

@@ -1,11 +1,14 @@
 import { TableDef } from '../schema/table.js';
 import { ColumnDef } from '../schema/column.js';
 import { ColumnNode, ExpressionNode } from '../core/ast/expression.js';
-import { CompiledQuery, DeleteCompiler } from '../core/dialect/abstract.js';
+import { CompiledQuery, DeleteCompiler, Dialect } from '../core/dialect/abstract.js';
+import { DialectKey, resolveDialectInput } from '../core/dialect/dialect-factory.js';
 import { DeleteQueryNode } from '../core/ast/query.js';
 import { DeleteQueryState } from './delete-query-state.js';
 import { buildColumnNode } from '../core/ast/builders.js';
 
+type DeleteDialectInput = Dialect | DialectKey;
+
 /**
  * Builder for DELETE queries
  */
@@ -32,12 +35,26 @@ export class DeleteQueryBuilder<T> {
     return this.clone(this.state.withReturning(nodes));
   }
 
-  compile(compiler: DeleteCompiler): CompiledQuery {
-    return compiler.compileDelete(this.state.ast);
+  // Existing compiler-based compile stays, but we add a new overload.
+
+  // 1) Keep the old behavior (used internally / tests, if any):
+  compile(compiler: DeleteCompiler): CompiledQuery;
+  // 2) New ergonomic overload:
+  compile(dialect: DeleteDialectInput): CompiledQuery;
+
+  compile(arg: DeleteCompiler | DeleteDialectInput): CompiledQuery {
+    if (typeof (arg as any).compileDelete === 'function') {
+      // DeleteCompiler path – old behavior
+      return (arg as DeleteCompiler).compileDelete(this.state.ast);
+    }
+
+    // Dialect | string path – new behavior
+    const dialect = resolveDialectInput(arg as DeleteDialectInput);
+    return dialect.compileDelete(this.state.ast);
   }
 
-  toSql(compiler: DeleteCompiler): string {
-    return this.compile(compiler).sql;
+  toSql(arg: DeleteCompiler | DeleteDialectInput): string {
+    return this.compile(arg as any).sql;
   }
 
   getAST(): DeleteQueryNode {

package/src/query-builder/hydration-manager.ts

@@ -1,6 +1,7 @@
 import { TableDef } from '../schema/table.js';
 import { RelationDef, RelationKinds } from '../schema/relation.js';
-import { CommonTableExpressionNode, HydrationPlan, OrderByNode, SelectQueryNode } from '../core/ast/query.js';
+import { CommonTableExpressionNode, OrderByNode, SelectQueryNode } from '../core/ast/query.js';
+import { HydrationPlan } from '../core/hydration/types.js';
 import { HydrationPlanner } from './hydration-planner.js';
 import { ProjectionNode, SelectQueryState } from './select-query-state.js';
 import { ColumnNode, eq } from '../core/ast/expression.js';

package/src/query-builder/hydration-planner.ts

@@ -1,7 +1,7 @@
 import { TableDef } from '../schema/table.js';
 import { RelationDef, RelationKinds, BelongsToManyRelation } from '../schema/relation.js';
 import { ProjectionNode } from './select-query-state.js';
-import { HydrationPlan, HydrationRelationPlan } from '../core/ast/query.js';
+import { HydrationPlan, HydrationRelationPlan } from '../core/hydration/types.js';
 import { isRelationAlias } from './relation-alias.js';
 import { buildDefaultPivotColumns } from './relation-utils.js';
 
@@ -111,12 +111,13 @@ export class HydrationPlanner {
     pivot?: { aliasPrefix: string; columns: string[] }
   ): HydrationRelationPlan {
     switch (rel.type) {
-      case RelationKinds.HasMany: {
-        const localKey = rel.localKey || findPrimaryKey(this.table);
-        return {
-          name: relationName,
-          aliasPrefix,
-          type: rel.type,
+      case RelationKinds.HasMany:
+      case RelationKinds.HasOne: {
+        const localKey = rel.localKey || findPrimaryKey(this.table);
+        return {
+          name: relationName,
+          aliasPrefix,
+          type: rel.type,
           targetTable: rel.target.name,
           targetPrimaryKey: findPrimaryKey(rel.target),
           foreignKey: rel.foreignKey,

package/src/query-builder/insert.ts

@@ -1,11 +1,14 @@
 import { TableDef } from '../schema/table.js';
 import { ColumnDef } from '../schema/column.js';
 import { ColumnNode } from '../core/ast/expression.js';
-import { CompiledQuery, InsertCompiler } from '../core/dialect/abstract.js';
+import { CompiledQuery, InsertCompiler, Dialect } from '../core/dialect/abstract.js';
+import { DialectKey, resolveDialectInput } from '../core/dialect/dialect-factory.js';
 import { InsertQueryNode } from '../core/ast/query.js';
 import { InsertQueryState } from './insert-query-state.js';
 import { buildColumnNode } from '../core/ast/builders.js';
 
+type InsertDialectInput = Dialect | DialectKey;
+
 /**
  * Builder for INSERT queries
  */
@@ -34,12 +37,26 @@ export class InsertQueryBuilder<T> {
     return this.clone(this.state.withReturning(nodes));
   }
 
-  compile(compiler: InsertCompiler): CompiledQuery {
-    return compiler.compileInsert(this.state.ast);
+  // Existing compiler-based compile stays, but we add a new overload.
+
+  // 1) Keep the old behavior (used internally / tests, if any):
+  compile(compiler: InsertCompiler): CompiledQuery;
+  // 2) New ergonomic overload:
+  compile(dialect: InsertDialectInput): CompiledQuery;
+
+  compile(arg: InsertCompiler | InsertDialectInput): CompiledQuery {
+    if (typeof (arg as any).compileInsert === 'function') {
+      // InsertCompiler path – old behavior
+      return (arg as InsertCompiler).compileInsert(this.state.ast);
+    }
+
+    // Dialect | string path – new behavior
+    const dialect = resolveDialectInput(arg as InsertDialectInput);
+    return dialect.compileInsert(this.state.ast);
   }
 
-  toSql(compiler: InsertCompiler): string {
-    return this.compile(compiler).sql;
+  toSql(arg: InsertCompiler | InsertDialectInput): string {
+    return this.compile(arg as any).sql;
   }
 
   getAST(): InsertQueryNode {

package/src/query-builder/relation-conditions.ts

@@ -23,17 +23,18 @@ const assertNever = (value: never): never => {
  */
 const baseRelationCondition = (root: TableDef, relation: RelationDef): ExpressionNode => {
   const defaultLocalKey =
-    relation.type === RelationKinds.HasMany
-      ? findPrimaryKey(root)
-      : findPrimaryKey(relation.target);
+  relation.type === RelationKinds.HasMany || relation.type === RelationKinds.HasOne
+    ? findPrimaryKey(root)
+    : findPrimaryKey(relation.target);
   const localKey = relation.localKey || defaultLocalKey;
 
   switch (relation.type) {
-    case RelationKinds.HasMany:
-      return eq(
-        { type: 'Column', table: relation.target.name, name: relation.foreignKey },
-        { type: 'Column', table: root.name, name: localKey }
-      );
+    case RelationKinds.HasMany:
+    case RelationKinds.HasOne:
+      return eq(
+        { type: 'Column', table: relation.target.name, name: relation.foreignKey },
+        { type: 'Column', table: root.name, name: localKey }
+      );
     case RelationKinds.BelongsTo:
       return eq(
         { type: 'Column', table: relation.target.name, name: localKey },

package/src/query-builder/relation-service.ts

@@ -20,7 +20,8 @@ import {
 } from './relation-conditions.js';
 import { JoinKind, JOIN_KINDS } from '../core/sql/sql.js';
 import { RelationIncludeOptions } from './relation-types.js';
-import { createJoinNode } from '../core/ast/join-node.js';
+import { createJoinNode } from '../core/ast/join-node.js';
+import { getJoinRelationName } from '../core/ast/join-metadata.js';
 import { makeRelationAlias } from './relation-alias.js';
 import { buildDefaultPivotColumns } from './relation-utils.js';
 
@@ -93,7 +94,7 @@ export class RelationService {
 
     const relation = this.getRelation(relationName);
     const aliasPrefix = options?.aliasPrefix ?? relationName;
-    const alreadyJoined = state.ast.joins.some(j => j.relationName === relationName);
+    const alreadyJoined = state.ast.joins.some(j => getJoinRelationName(j) === relationName);
 
     if (!alreadyJoined) {
       const joined = this.joinRelation(relationName, options?.joinKind ?? JOIN_KINDS.LEFT, options?.filter);

package/src/query-builder/select.ts

@@ -1,6 +1,7 @@
 import { TableDef } from '../schema/table.js';
 import { ColumnDef } from '../schema/column.js';
-import { SelectQueryNode, HydrationPlan, SetOperationKind } from '../core/ast/query.js';
+import { SelectQueryNode, SetOperationKind } from '../core/ast/query.js';
+import { HydrationPlan } from '../core/hydration/types.js';
 import {
   ColumnNode,
   ExpressionNode,
@@ -13,6 +14,9 @@ import {
   notExists
 } from '../core/ast/expression.js';
 import { CompiledQuery, Dialect } from '../core/dialect/abstract.js';
+import { DialectKey, resolveDialectInput } from '../core/dialect/dialect-factory.js';
+
+type SelectDialectInput = Dialect | DialectKey;
 import { SelectQueryState } from './select-query-state.js';
 import { HydrationManager } from './hydration-manager.js';
 import {
@@ -96,23 +100,23 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
     return { state: nextState, hydration: context.hydration };
   }
 
-  private applyJoin(
-    context: SelectQueryBuilderContext,
-    table: TableDef,
-    condition: BinaryExpressionNode,
-    kind: JoinKind
-  ): SelectQueryBuilderContext {
-    const joinNode = createJoinNode(kind, table.name, condition);
-    return this.applyAst(context, service => service.withJoin(joinNode));
-  }
-
-  private applySetOperation(
-    operator: SetOperationKind,
-    query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode
-  ): SelectQueryBuilderContext {
-    const subAst = this.resolveQueryNode(query);
-    return this.applyAst(this.context, service => service.withSetOperation(operator, subAst));
-  }
+  private applyJoin(
+    context: SelectQueryBuilderContext,
+    table: TableDef,
+    condition: BinaryExpressionNode,
+    kind: JoinKind
+  ): SelectQueryBuilderContext {
+    const joinNode = createJoinNode(kind, table.name, condition);
+    return this.applyAst(context, service => service.withJoin(joinNode));
+  }
+
+  private applySetOperation(
+    operator: SetOperationKind,
+    query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode
+  ): SelectQueryBuilderContext {
+    const subAst = this.resolveQueryNode(query);
+    return this.applyAst(this.context, service => service.withSetOperation(operator, subAst));
+  }
 
   /**
    * Selects specific columns for the query
@@ -323,46 +327,46 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
    * @param n - Number of rows to skip
    * @returns New query builder instance with the OFFSET clause
    */
-  offset(n: number): SelectQueryBuilder<T, TTable> {
-    const nextContext = this.applyAst(this.context, service => service.withOffset(n));
-    return this.clone(nextContext);
-  }
-
-  /**
-   * Combines this query with another using UNION
-   * @param query - Query to union with
-   * @returns New query builder instance with the set operation
-   */
-  union(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-    return this.clone(this.applySetOperation('UNION', query));
-  }
-
-  /**
-   * Combines this query with another using UNION ALL
-   * @param query - Query to union with
-   * @returns New query builder instance with the set operation
-   */
-  unionAll(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-    return this.clone(this.applySetOperation('UNION ALL', query));
-  }
-
-  /**
-   * Combines this query with another using INTERSECT
-   * @param query - Query to intersect with
-   * @returns New query builder instance with the set operation
-   */
-  intersect(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-    return this.clone(this.applySetOperation('INTERSECT', query));
-  }
-
-  /**
-   * Combines this query with another using EXCEPT
-   * @param query - Query to subtract
-   * @returns New query builder instance with the set operation
-   */
-  except(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
-    return this.clone(this.applySetOperation('EXCEPT', query));
-  }
+  offset(n: number): SelectQueryBuilder<T, TTable> {
+    const nextContext = this.applyAst(this.context, service => service.withOffset(n));
+    return this.clone(nextContext);
+  }
+
+  /**
+   * Combines this query with another using UNION
+   * @param query - Query to union with
+   * @returns New query builder instance with the set operation
+   */
+  union(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+    return this.clone(this.applySetOperation('UNION', query));
+  }
+
+  /**
+   * Combines this query with another using UNION ALL
+   * @param query - Query to union with
+   * @returns New query builder instance with the set operation
+   */
+  unionAll(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+    return this.clone(this.applySetOperation('UNION ALL', query));
+  }
+
+  /**
+   * Combines this query with another using INTERSECT
+   * @param query - Query to intersect with
+   * @returns New query builder instance with the set operation
+   */
+  intersect(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+    return this.clone(this.applySetOperation('INTERSECT', query));
+  }
+
+  /**
+   * Combines this query with another using EXCEPT
+   * @param query - Query to subtract
+   * @returns New query builder instance with the set operation
+   */
+  except(query: SelectQueryBuilder<any, TableDef<any>> | SelectQueryNode): SelectQueryBuilder<T, TTable> {
+    return this.clone(this.applySetOperation('EXCEPT', query));
+  }
 
   /**
    * Adds a WHERE EXISTS condition to the query
@@ -443,8 +447,9 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
    * @param dialect - Database dialect to compile for
    * @returns Compiled query with SQL and parameters
    */
-  compile(dialect: Dialect): CompiledQuery {
-    return dialect.compileSelect(this.context.state.ast);
+  compile(dialect: SelectDialectInput): CompiledQuery {
+    const resolved = resolveDialectInput(dialect);
+    return resolved.compileSelect(this.context.state.ast);
   }
 
   /**
@@ -452,7 +457,7 @@ export class SelectQueryBuilder<T = any, TTable extends TableDef = TableDef> {
    * @param dialect - Database dialect to generate SQL for
    * @returns SQL string representation of the query
    */
-  toSql(dialect: Dialect): string {
+  toSql(dialect: SelectDialectInput): string {
     return this.compile(dialect).sql;
   }
 

package/src/query-builder/update.ts

@@ -1,11 +1,14 @@
 import { TableDef } from '../schema/table.js';
 import { ColumnDef } from '../schema/column.js';
 import { ColumnNode, ExpressionNode } from '../core/ast/expression.js';
-import { CompiledQuery, UpdateCompiler } from '../core/dialect/abstract.js';
+import { CompiledQuery, UpdateCompiler, Dialect } from '../core/dialect/abstract.js';
+import { DialectKey, resolveDialectInput } from '../core/dialect/dialect-factory.js';
 import { UpdateQueryNode } from '../core/ast/query.js';
 import { UpdateQueryState } from './update-query-state.js';
 import { buildColumnNode } from '../core/ast/builders.js';
 
+type UpdateDialectInput = Dialect | DialectKey;
+
 /**
  * Builder for UPDATE queries
  */
@@ -36,12 +39,26 @@ export class UpdateQueryBuilder<T> {
     return this.clone(this.state.withReturning(nodes));
   }
 
-  compile(compiler: UpdateCompiler): CompiledQuery {
-    return compiler.compileUpdate(this.state.ast);
+  // Existing compiler-based compile stays, but we add a new overload.
+
+  // 1) Keep the old behavior (used internally / tests, if any):
+  compile(compiler: UpdateCompiler): CompiledQuery;
+  // 2) New ergonomic overload:
+  compile(dialect: UpdateDialectInput): CompiledQuery;
+
+  compile(arg: UpdateCompiler | UpdateDialectInput): CompiledQuery {
+    if (typeof (arg as any).compileUpdate === 'function') {
+      // UpdateCompiler path – old behavior
+      return (arg as UpdateCompiler).compileUpdate(this.state.ast);
+    }
+
+    // Dialect | string path – new behavior
+    const dialect = resolveDialectInput(arg as UpdateDialectInput);
+    return dialect.compileUpdate(this.state.ast);
   }
 
-  toSql(compiler: UpdateCompiler): string {
-    return this.compile(compiler).sql;
+  toSql(arg: UpdateCompiler | UpdateDialectInput): string {
+    return this.compile(arg as any).sql;
   }
 
   getAST(): UpdateQueryNode {