metal-orm 1.0.38 → 1.0.40

package/src/core/dialect/mssql/index.ts

@@ -1,100 +1,101 @@
-import { CompilerContext, Dialect } from '../abstract.js';
-import { SelectQueryNode, InsertQueryNode, UpdateQueryNode, DeleteQueryNode, TableSourceNode, DerivedTableNode } from '../../ast/query.js';
+import { CompilerContext, Dialect } from '../abstract.js';
+import { SelectQueryNode, InsertQueryNode, UpdateQueryNode, DeleteQueryNode, TableSourceNode, DerivedTableNode, OrderByNode } from '../../ast/query.js';
 import { JsonPathNode } from '../../ast/expression.js';
 import { MssqlFunctionStrategy } from './functions.js';
 import { FunctionTableFormatter } from '../base/function-table-formatter.js';
-
-/**
- * Microsoft SQL Server dialect implementation
- */
-export class SqlServerDialect extends Dialect {
-  protected readonly dialect = 'mssql';
-  /**
-   * Creates a new SqlServerDialect instance
-   */
-  public constructor() {
-    super(new MssqlFunctionStrategy());
-  }
-
-  /**
-   * Quotes an identifier using SQL Server bracket syntax
-   * @param id - Identifier to quote
-   * @returns Quoted identifier
-   */
-  quoteIdentifier(id: string): string {
-    return `[${id}]`;
-  }
-
-  /**
-   * Compiles JSON path expression using SQL Server syntax
-   * @param node - JSON path node
-   * @returns SQL Server JSON path expression
-   */
-  protected compileJsonPath(node: JsonPathNode): string {
-    const col = `${this.quoteIdentifier(node.column.table)}.${this.quoteIdentifier(node.column.name)}`;
-    // SQL Server uses JSON_VALUE(col, '$.path')
-    return `JSON_VALUE(${col}, '${node.path}')`;
-  }
-
-  /**
-   * Formats parameter placeholders using SQL Server named parameter syntax
-   * @param index - Parameter index
-   * @returns Named parameter placeholder
-   */
-  protected formatPlaceholder(index: number): string {
-    return `@p${index}`;
-  }
-
-  /**
-   * Compiles SELECT query AST to SQL Server SQL
-   * @param ast - Query AST
-   * @param ctx - Compiler context
-   * @returns SQL Server SQL string
-   */
-  protected compileSelectAst(ast: SelectQueryNode, ctx: CompilerContext): string {
-    const hasSetOps = !!(ast.setOps && ast.setOps.length);
-    const ctes = this.compileCtes(ast, ctx);
-
-    const baseAst: SelectQueryNode = hasSetOps
-      ? { ...ast, setOps: undefined, orderBy: undefined, limit: undefined, offset: undefined }
-      : ast;
-
-    const baseSelect = this.compileSelectCore(baseAst, ctx);
-
-    if (!hasSetOps) {
-      return `${ctes}${baseSelect}`;
-    }
-
-    const compound = ast.setOps!
-      .map(op => `${op.operator} ${this.wrapSetOperand(this.compileSelectAst(op.query, ctx))}`)
-      .join(' ');
-
-    const orderBy = this.compileOrderBy(ast);
-    const pagination = this.compilePagination(ast, orderBy);
-    const combined = `${this.wrapSetOperand(baseSelect)} ${compound}`;
-    const tail = pagination || orderBy;
-    return `${ctes}${combined}${tail}`;
-  }
-
-  protected compileInsertAst(ast: InsertQueryNode, ctx: CompilerContext): string {
-    const table = this.quoteIdentifier(ast.into.name);
-    const columnList = ast.columns.map(column => `${this.quoteIdentifier(column.table)}.${this.quoteIdentifier(column.name)}`).join(', ');
-    const values = ast.values.map(row => `(${row.map(value => this.compileOperand(value, ctx)).join(', ')})`).join(', ');
-    return `INSERT INTO ${table} (${columnList}) VALUES ${values};`;
-  }
-
-  protected compileUpdateAst(ast: UpdateQueryNode, ctx: CompilerContext): string {
-    const table = this.quoteIdentifier(ast.table.name);
-    const assignments = ast.set.map(assignment => {
-      const col = assignment.column;
-      const target = `${this.quoteIdentifier(col.table)}.${this.quoteIdentifier(col.name)}`;
-      const value = this.compileOperand(assignment.value, ctx);
-      return `${target} = ${value}`;
-    }).join(', ');
-    const whereClause = this.compileWhere(ast.where, ctx);
-    return `UPDATE ${table} SET ${assignments}${whereClause};`;
-  }
-
+import { OrderByCompiler } from '../base/orderby-compiler.js';
+
+/**
+ * Microsoft SQL Server dialect implementation
+ */
+export class SqlServerDialect extends Dialect {
+  protected readonly dialect = 'mssql';
+  /**
+   * Creates a new SqlServerDialect instance
+   */
+  public constructor() {
+    super(new MssqlFunctionStrategy());
+  }
+
+  /**
+   * Quotes an identifier using SQL Server bracket syntax
+   * @param id - Identifier to quote
+   * @returns Quoted identifier
+   */
+  quoteIdentifier(id: string): string {
+    return `[${id}]`;
+  }
+
+  /**
+   * Compiles JSON path expression using SQL Server syntax
+   * @param node - JSON path node
+   * @returns SQL Server JSON path expression
+   */
+  protected compileJsonPath(node: JsonPathNode): string {
+    const col = `${this.quoteIdentifier(node.column.table)}.${this.quoteIdentifier(node.column.name)}`;
+    // SQL Server uses JSON_VALUE(col, '$.path')
+    return `JSON_VALUE(${col}, '${node.path}')`;
+  }
+
+  /**
+   * Formats parameter placeholders using SQL Server named parameter syntax
+   * @param index - Parameter index
+   * @returns Named parameter placeholder
+   */
+  protected formatPlaceholder(index: number): string {
+    return `@p${index}`;
+  }
+
+  /**
+   * Compiles SELECT query AST to SQL Server SQL
+   * @param ast - Query AST
+   * @param ctx - Compiler context
+   * @returns SQL Server SQL string
+   */
+  protected compileSelectAst(ast: SelectQueryNode, ctx: CompilerContext): string {
+    const hasSetOps = !!(ast.setOps && ast.setOps.length);
+    const ctes = this.compileCtes(ast, ctx);
+
+    const baseAst: SelectQueryNode = hasSetOps
+      ? { ...ast, setOps: undefined, orderBy: undefined, limit: undefined, offset: undefined }
+      : ast;
+
+    const baseSelect = this.compileSelectCore(baseAst, ctx);
+
+    if (!hasSetOps) {
+      return `${ctes}${baseSelect}`;
+    }
+
+    const compound = ast.setOps!
+      .map(op => `${op.operator} ${this.wrapSetOperand(this.compileSelectAst(op.query, ctx))}`)
+      .join(' ');
+
+    const orderBy = this.compileOrderBy(ast, ctx);
+    const pagination = this.compilePagination(ast, orderBy);
+    const combined = `${this.wrapSetOperand(baseSelect)} ${compound}`;
+    const tail = pagination || orderBy;
+    return `${ctes}${combined}${tail}`;
+  }
+
+  protected compileInsertAst(ast: InsertQueryNode, ctx: CompilerContext): string {
+    const table = this.quoteIdentifier(ast.into.name);
+    const columnList = ast.columns.map(column => `${this.quoteIdentifier(column.table)}.${this.quoteIdentifier(column.name)}`).join(', ');
+    const values = ast.values.map(row => `(${row.map(value => this.compileOperand(value, ctx)).join(', ')})`).join(', ');
+    return `INSERT INTO ${table} (${columnList}) VALUES ${values};`;
+  }
+
+  protected compileUpdateAst(ast: UpdateQueryNode, ctx: CompilerContext): string {
+    const table = this.quoteIdentifier(ast.table.name);
+    const assignments = ast.set.map(assignment => {
+      const col = assignment.column;
+      const target = `${this.quoteIdentifier(col.table)}.${this.quoteIdentifier(col.name)}`;
+      const value = this.compileOperand(assignment.value, ctx);
+      return `${target} = ${value}`;
+    }).join(', ');
+    const whereClause = this.compileWhere(ast.where, ctx);
+    return `UPDATE ${table} SET ${assignments}${whereClause};`;
+  }
+
   protected compileDeleteAst(ast: DeleteQueryNode, ctx: CompilerContext): string {
     if (ast.from.type !== 'Table') {
       throw new Error('DELETE only supports base tables in the MSSQL dialect.');
@@ -105,24 +106,24 @@ export class SqlServerDialect extends Dialect {
   }
 
   private compileSelectCore(ast: SelectQueryNode, ctx: CompilerContext): string {
-    const columns = ast.columns.map(c => {
-      let expr = '';
-      if (c.type === 'Function') {
-        expr = this.compileOperand(c, ctx);
-      } else if (c.type === 'Column') {
-        expr = `${this.quoteIdentifier(c.table)}.${this.quoteIdentifier(c.name)}`;
-      } else if (c.type === 'ScalarSubquery') {
-        expr = this.compileOperand(c, ctx);
-      } else if (c.type === 'WindowFunction') {
-        expr = this.compileOperand(c, ctx);
-      }
-
-      if (c.alias) {
-        if (c.alias.includes('(')) return c.alias;
-        return `${expr} AS ${this.quoteIdentifier(c.alias)}`;
-      }
-      return expr;
-    }).join(', ');
+    const columns = ast.columns.map(c => {
+      let expr = '';
+      if (c.type === 'Function') {
+        expr = this.compileOperand(c, ctx);
+      } else if (c.type === 'Column') {
+        expr = `${this.quoteIdentifier(c.table)}.${this.quoteIdentifier(c.name)}`;
+      } else if (c.type === 'ScalarSubquery') {
+        expr = this.compileOperand(c, ctx);
+      } else if (c.type === 'WindowFunction') {
+        expr = this.compileOperand(c, ctx);
+      }
+
+      if (c.alias) {
+        if (c.alias.includes('(')) return c.alias;
+        return `${expr} AS ${this.quoteIdentifier(c.alias)}`;
+      }
+      return expr;
+    }).join(', ');
 
     const distinct = ast.distinct ? 'DISTINCT ' : '';
     const from = this.compileTableSource(ast.from, ctx);
@@ -132,47 +133,57 @@ export class SqlServerDialect extends Dialect {
       const cond = this.compileExpression(j.condition, ctx);
       return `${j.kind} JOIN ${table} ON ${cond}`;
     }).join(' ');
-    const whereClause = this.compileWhere(ast.where, ctx);
-
-    const groupBy = ast.groupBy && ast.groupBy.length > 0
-      ? ' GROUP BY ' + ast.groupBy.map(c => `${this.quoteIdentifier(c.table)}.${this.quoteIdentifier(c.name)}`).join(', ')
-      : '';
-
-    const having = ast.having
-      ? ` HAVING ${this.compileExpression(ast.having, ctx)}`
-      : '';
-
-    const orderBy = this.compileOrderBy(ast);
-    const pagination = this.compilePagination(ast, orderBy);
-
-    if (pagination) {
-      return `SELECT ${distinct}${columns} FROM ${from}${joins ? ' ' + joins : ''}${whereClause}${groupBy}${having}${pagination}`;
-    }
-
-    return `SELECT ${distinct}${columns} FROM ${from}${joins ? ' ' + joins : ''}${whereClause}${groupBy}${having}${orderBy}`;
-  }
-
-  private compileOrderBy(ast: SelectQueryNode): string {
-    if (!ast.orderBy || ast.orderBy.length === 0) return '';
-    return ' ORDER BY ' + ast.orderBy
-      .map(o => `${this.quoteIdentifier(o.column.table)}.${this.quoteIdentifier(o.column.name)} ${o.direction}`)
-      .join(', ');
-  }
-
+    const whereClause = this.compileWhere(ast.where, ctx);
+
+    const groupBy = ast.groupBy && ast.groupBy.length > 0
+      ? ' GROUP BY ' + ast.groupBy.map(term => this.compileOrderingTerm(term, ctx)).join(', ')
+      : '';
+
+    const having = ast.having
+      ? ` HAVING ${this.compileExpression(ast.having, ctx)}`
+      : '';
+
+    const orderBy = this.compileOrderBy(ast, ctx);
+    const pagination = this.compilePagination(ast, orderBy);
+
+    if (pagination) {
+      return `SELECT ${distinct}${columns} FROM ${from}${joins ? ' ' + joins : ''}${whereClause}${groupBy}${having}${pagination}`;
+    }
+
+    return `SELECT ${distinct}${columns} FROM ${from}${joins ? ' ' + joins : ''}${whereClause}${groupBy}${having}${orderBy}`;
+  }
+
+  private compileOrderBy(ast: SelectQueryNode, ctx: CompilerContext): string {
+    return OrderByCompiler.compileOrderBy(
+      ast,
+      term => this.compileOrderingTerm(term, ctx),
+      this.renderOrderByNulls.bind(this),
+      this.renderOrderByCollation.bind(this)
+    );
+  }
+
   private compilePagination(ast: SelectQueryNode, orderBy: string): string {
     const hasLimit = ast.limit !== undefined;
     const hasOffset = ast.offset !== undefined;
     if (!hasLimit && !hasOffset) return '';
-
-    const off = ast.offset ?? 0;
-    const orderClause = orderBy || ' ORDER BY (SELECT NULL)';
-    let pagination = `${orderClause} OFFSET ${off} ROWS`;
+
+    const off = ast.offset ?? 0;
+    const orderClause = orderBy || ' ORDER BY (SELECT NULL)';
+    let pagination = `${orderClause} OFFSET ${off} ROWS`;
     if (hasLimit) {
       pagination += ` FETCH NEXT ${ast.limit} ROWS ONLY`;
     }
     return pagination;
   }
 
+  private renderOrderByNulls(order: OrderByNode): string | undefined {
+    return order.nulls ? ` NULLS ${order.nulls}` : '';
+  }
+
+  private renderOrderByCollation(order: OrderByNode): string | undefined {
+    return order.collation ? ` COLLATE ${order.collation}` : '';
+  }
+
   private compileTableSource(table: TableSourceNode, ctx: CompilerContext): string {
     if (table.type === 'FunctionTable') {
       return FunctionTableFormatter.format(table, ctx, this as any);
@@ -193,21 +204,21 @@ export class SqlServerDialect extends Dialect {
       : '';
     return `(${sub}) AS ${this.quoteIdentifier(table.alias)}${cols}`;
   }
-
-  private compileCtes(ast: SelectQueryNode, ctx: CompilerContext): string {
-    if (!ast.ctes || ast.ctes.length === 0) return '';
-    // MSSQL does not use RECURSIVE keyword, but supports recursion when CTE references itself.
-    const defs = ast.ctes.map(cte => {
-      const name = this.quoteIdentifier(cte.name);
-      const cols = cte.columns ? `(${cte.columns.map(c => this.quoteIdentifier(c)).join(', ')})` : '';
-      const query = this.compileSelectAst(this.normalizeSelectAst(cte.query), ctx).trim().replace(/;$/, '');
-      return `${name}${cols} AS (${query})`;
-    }).join(', ');
-    return `WITH ${defs} `;
-  }
-
-  private wrapSetOperand(sql: string): string {
-    const trimmed = sql.trim().replace(/;$/, '');
-    return `(${trimmed})`;
-  }
-}
+
+  private compileCtes(ast: SelectQueryNode, ctx: CompilerContext): string {
+    if (!ast.ctes || ast.ctes.length === 0) return '';
+    // MSSQL does not use RECURSIVE keyword, but supports recursion when CTE references itself.
+    const defs = ast.ctes.map(cte => {
+      const name = this.quoteIdentifier(cte.name);
+      const cols = cte.columns ? `(${cte.columns.map(c => this.quoteIdentifier(c)).join(', ')})` : '';
+      const query = this.compileSelectAst(this.normalizeSelectAst(cte.query), ctx).trim().replace(/;$/, '');
+      return `${name}${cols} AS (${query})`;
+    }).join(', ');
+    return `WITH ${defs} `;
+  }
+
+  private wrapSetOperand(sql: string): string {
+    const trimmed = sql.trim().replace(/;$/, '');
+    return `(${trimmed})`;
+  }
+}

package/src/core/functions/standard-strategy.ts

@@ -1,13 +1,13 @@
 import { FunctionStrategy, FunctionRenderer, FunctionRenderContext } from './types.js';
-import { LiteralNode, OperandNode } from '../ast/expression.js';
-
-export class StandardFunctionStrategy implements FunctionStrategy {
-    protected renderers: Map<string, FunctionRenderer> = new Map();
-
-    constructor() {
-        this.registerStandard();
-    }
-
+import { LiteralNode, OperandNode, isOperandNode } from '../ast/expression.js';
+
+export class StandardFunctionStrategy implements FunctionStrategy {
+    protected renderers: Map<string, FunctionRenderer> = new Map();
+
+    constructor() {
+        this.registerStandard();
+    }
+
     protected registerStandard() {
         // Register ANSI standard implementations
         this.add('COUNT', ({ compiledArgs }) => `COUNT(${compiledArgs.join(', ')})`);
@@ -18,36 +18,36 @@ export class StandardFunctionStrategy implements FunctionStrategy {
         this.add('ABS', ({ compiledArgs }) => `ABS(${compiledArgs[0]})`);
         this.add('UPPER', ({ compiledArgs }) => `UPPER(${compiledArgs[0]})`);
         this.add('LOWER', ({ compiledArgs }) => `LOWER(${compiledArgs[0]})`);
-        this.add('LENGTH', ({ compiledArgs }) => `LENGTH(${compiledArgs[0]})`);
-        this.add('TRIM', ({ compiledArgs }) => `TRIM(${compiledArgs[0]})`);
-        this.add('LTRIM', ({ compiledArgs }) => `LTRIM(${compiledArgs[0]})`);
-        this.add('RTRIM', ({ compiledArgs }) => `RTRIM(${compiledArgs[0]})`);
-        this.add('SUBSTRING', ({ compiledArgs }) => `SUBSTRING(${compiledArgs.join(', ')})`);
-        this.add('CONCAT', ({ compiledArgs }) => `CONCAT(${compiledArgs.join(', ')})`);
-        this.add('NOW', () => `NOW()`);
-        this.add('CURRENT_DATE', () => `CURRENT_DATE`);
-        this.add('CURRENT_TIME', () => `CURRENT_TIME`);
-        this.add('EXTRACT', ({ compiledArgs }) => `EXTRACT(${compiledArgs[0]} FROM ${compiledArgs[1]})`);
-        this.add('YEAR', ({ compiledArgs }) => `EXTRACT(YEAR FROM ${compiledArgs[0]})`);
-        this.add('MONTH', ({ compiledArgs }) => `EXTRACT(MONTH FROM ${compiledArgs[0]})`);
-        this.add('DAY', ({ compiledArgs }) => `EXTRACT(DAY FROM ${compiledArgs[0]})`);
-        this.add('DATE_ADD', ({ compiledArgs }) => `(${compiledArgs[0]} + INTERVAL ${compiledArgs[1]} ${compiledArgs[2]})`);
-        this.add('DATE_SUB', ({ compiledArgs }) => `(${compiledArgs[0]} - INTERVAL ${compiledArgs[1]} ${compiledArgs[2]})`);
-        this.add('DATE_DIFF', ({ compiledArgs }) => `DATEDIFF(${compiledArgs[0]}, ${compiledArgs[1]})`);
-        this.add('DATE_FORMAT', ({ compiledArgs }) => `DATE_FORMAT(${compiledArgs[0]}, ${compiledArgs[1]})`);
-        this.add('UNIX_TIMESTAMP', () => `UNIX_TIMESTAMP()`);
-        this.add('FROM_UNIXTIME', ({ compiledArgs }) => `FROM_UNIXTIME(${compiledArgs[0]})`);
-        this.add('END_OF_MONTH', ({ compiledArgs }) => `LAST_DAY(${compiledArgs[0]})`);
-        this.add('DAY_OF_WEEK', ({ compiledArgs }) => `DAYOFWEEK(${compiledArgs[0]})`);
+        this.add('LENGTH', ({ compiledArgs }) => `LENGTH(${compiledArgs[0]})`);
+        this.add('TRIM', ({ compiledArgs }) => `TRIM(${compiledArgs[0]})`);
+        this.add('LTRIM', ({ compiledArgs }) => `LTRIM(${compiledArgs[0]})`);
+        this.add('RTRIM', ({ compiledArgs }) => `RTRIM(${compiledArgs[0]})`);
+        this.add('SUBSTRING', ({ compiledArgs }) => `SUBSTRING(${compiledArgs.join(', ')})`);
+        this.add('CONCAT', ({ compiledArgs }) => `CONCAT(${compiledArgs.join(', ')})`);
+        this.add('NOW', () => `NOW()`);
+        this.add('CURRENT_DATE', () => `CURRENT_DATE`);
+        this.add('CURRENT_TIME', () => `CURRENT_TIME`);
+        this.add('EXTRACT', ({ compiledArgs }) => `EXTRACT(${compiledArgs[0]} FROM ${compiledArgs[1]})`);
+        this.add('YEAR', ({ compiledArgs }) => `EXTRACT(YEAR FROM ${compiledArgs[0]})`);
+        this.add('MONTH', ({ compiledArgs }) => `EXTRACT(MONTH FROM ${compiledArgs[0]})`);
+        this.add('DAY', ({ compiledArgs }) => `EXTRACT(DAY FROM ${compiledArgs[0]})`);
+        this.add('DATE_ADD', ({ compiledArgs }) => `(${compiledArgs[0]} + INTERVAL ${compiledArgs[1]} ${compiledArgs[2]})`);
+        this.add('DATE_SUB', ({ compiledArgs }) => `(${compiledArgs[0]} - INTERVAL ${compiledArgs[1]} ${compiledArgs[2]})`);
+        this.add('DATE_DIFF', ({ compiledArgs }) => `DATEDIFF(${compiledArgs[0]}, ${compiledArgs[1]})`);
+        this.add('DATE_FORMAT', ({ compiledArgs }) => `DATE_FORMAT(${compiledArgs[0]}, ${compiledArgs[1]})`);
+        this.add('UNIX_TIMESTAMP', () => `UNIX_TIMESTAMP()`);
+        this.add('FROM_UNIXTIME', ({ compiledArgs }) => `FROM_UNIXTIME(${compiledArgs[0]})`);
+        this.add('END_OF_MONTH', ({ compiledArgs }) => `LAST_DAY(${compiledArgs[0]})`);
+        this.add('DAY_OF_WEEK', ({ compiledArgs }) => `DAYOFWEEK(${compiledArgs[0]})`);
         this.add('WEEK_OF_YEAR', ({ compiledArgs }) => `WEEKOFYEAR(${compiledArgs[0]})`);
         this.add('DATE_TRUNC', ({ compiledArgs }) => `DATE_TRUNC(${compiledArgs[0]}, ${compiledArgs[1]})`);
         this.add('GROUP_CONCAT', ctx => this.renderGroupConcat(ctx));
-    }
-
-    protected add(name: string, renderer: FunctionRenderer) {
-        this.renderers.set(name, renderer);
-    }
-
+    }
+
+    protected add(name: string, renderer: FunctionRenderer) {
+        this.renderers.set(name, renderer);
+    }
+
     getRenderer(name: string): FunctionRenderer | undefined {
         return this.renderers.get(name);
     }
@@ -65,7 +65,16 @@ export class StandardFunctionStrategy implements FunctionStrategy {
         if (!orderBy || orderBy.length === 0) {
             return '';
         }
-        const parts = orderBy.map(order => `${ctx.compileOperand(order.column)} ${order.direction}`);
+        const parts = orderBy.map(order => {
+            const term = isOperandNode(order.term)
+                ? ctx.compileOperand(order.term)
+                : (() => {
+                    throw new Error('ORDER BY expressions inside functions must be operands');
+                })();
+            const collation = order.collation ? ` COLLATE ${order.collation}` : '';
+            const nulls = order.nulls ? ` NULLS ${order.nulls}` : '';
+            return `${term} ${order.direction}${collation}${nulls}`;
+        });
         return `ORDER BY ${parts.join(', ')}`;
     }