@carbonorm/carbonnode 3.8.3 → 3.9.0

package/src/api/orm/queries/SelectQueryBuilder.ts

@@ -4,6 +4,10 @@ import {SqlBuilderResult} from "../utils/sqlUtils";
 
 export class SelectQueryBuilder<G extends OrmGenerics> extends PaginationBuilder<G>{
 
+    protected createSelectBuilder(request: any) {
+        return new SelectQueryBuilder(this.config as any, request, this.useNamedParams);
+    }
+
     build(
         table: string,
         isSubSelect: boolean = false
@@ -17,7 +21,7 @@ export class SelectQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
         const params = this.useNamedParams ? {} : [];
         const selectList = args.SELECT ?? ['*'];
         const selectFields = selectList
-            .map((f: any) => this.buildAggregateField(f))
+            .map((f: any) => this.buildAggregateField(f, params))
             .join(', ');
 
         let sql = `SELECT ${selectFields} FROM \`${table}\``;
@@ -42,7 +46,7 @@ export class SelectQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
         }
 
         if (args.PAGINATION) {
-            sql += this.buildPaginationClause(args.PAGINATION);
+            sql += this.buildPaginationClause(args.PAGINATION, params);
         } else if (!isSubSelect) {
             sql += ` LIMIT 100`;
         }

package/src/api/orm/queries/UpdateQueryBuilder.ts

@@ -2,8 +2,13 @@ import {C6C} from "../../C6Constants";
 import {OrmGenerics} from "../../types/ormGenerics";
 import { PaginationBuilder } from '../builders/PaginationBuilder';
 import {SqlBuilderResult} from "../utils/sqlUtils";
+import {SelectQueryBuilder} from "./SelectQueryBuilder";
 
 export class UpdateQueryBuilder<G extends OrmGenerics> extends PaginationBuilder<G>{
+    protected createSelectBuilder(request: any) {
+        return new SelectQueryBuilder(this.config as any, request, this.useNamedParams);
+    }
+
     private trimTablePrefix(table: string, column: string): string {
         if (!column.includes('.')) return column;
         const [prefix, col] = column.split('.', 2);
@@ -44,7 +49,7 @@ export class UpdateQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
         }
 
         if (args.PAGINATION) {
-            sql += this.buildPaginationClause(args.PAGINATION);
+            sql += this.buildPaginationClause(args.PAGINATION, params);
         }
 
         return { sql, params };

package/src/api/orm/queryHelpers.ts

@@ -1,6 +1,65 @@
 // Alias a table name with a given alias
 import {C6C} from "../C6Constants";
 
+type DerivedTableSpec = Record<string, any> & {
+    [C6C.SUBSELECT]?: Record<string, any>;
+    [C6C.AS]?: string;
+};
+
+const DERIVED_TABLE_PREFIX = '__c6DerivedTable__';
+const DERIVED_ID_SYMBOL = Symbol('c6DerivedTableId');
+
+const derivedTableLookup = new Map<string, DerivedTableSpec>();
+const derivedTableReverseLookup = new WeakMap<DerivedTableSpec, string>();
+let derivedTableCounter = 0;
+
+export const isDerivedTableKey = (key: string): boolean =>
+    typeof key === 'string' && key.startsWith(DERIVED_TABLE_PREFIX);
+
+export const resolveDerivedTable = (key: string): DerivedTableSpec | undefined =>
+    derivedTableLookup.get(key);
+
+export const derivedTable = <T extends DerivedTableSpec>(spec: T): T => {
+    if (!spec || typeof spec !== 'object') {
+        throw new Error('Derived table definition must be an object.');
+    }
+
+    const aliasRaw = spec[C6C.AS];
+    if (typeof aliasRaw !== 'string' || aliasRaw.trim() === '') {
+        throw new Error('Derived tables require a non-empty alias via C6C.AS.');
+    }
+
+    if (!spec[C6C.SUBSELECT] || typeof spec[C6C.SUBSELECT] !== 'object') {
+        throw new Error('Derived tables require a nested SELECT payload under C6C.SUBSELECT.');
+    }
+
+    let id = derivedTableReverseLookup.get(spec);
+
+    if (!id) {
+        id = `${DERIVED_TABLE_PREFIX}${++derivedTableCounter}`;
+        derivedTableReverseLookup.set(spec, id);
+        derivedTableLookup.set(id, spec);
+        Object.defineProperty(spec, DERIVED_ID_SYMBOL, {
+            value: id,
+            configurable: false,
+            enumerable: false,
+            writable: false
+        });
+    }
+
+    const alias = aliasRaw.trim();
+    derivedTableLookup.set(id!, spec);
+
+    Object.defineProperty(spec, 'toString', {
+        value: () => `${id} ${alias}`,
+        configurable: true,
+        enumerable: false,
+        writable: true
+    });
+
+    return spec;
+};
+
 export const A = (tableName: string, alias: string): string =>
     `${tableName} ${alias}`;