@memberjunction/generic-database-provider 5.14.0 → 5.16.0

package/dist/queryPagingEngine.d.ts

@@ -0,0 +1,87 @@
+import { DatabasePlatform } from '@memberjunction/core';
+/**
+ * Result of wrapping SQL with paging directives.
+ */
+export interface PagingWrappedSQL {
+    /** SQL that returns the paged data rows */
+    DataSQL: string;
+    /** SQL that returns the total row count (without paging) */
+    CountSQL: string;
+    /** The computed offset (same as startRow input) */
+    Offset: number;
+    /** The page size (same as maxRows input) */
+    PageSize: number;
+}
+/**
+ * Handles server-side pagination for query SQL by wrapping resolved SQL in CTEs
+ * and applying platform-specific OFFSET/FETCH or LIMIT/OFFSET clauses.
+ *
+ * Uses a two-tier strategy:
+ *   1. **AST path** — parse SQL via node-sql-parser, extract ORDER BY and TOP from
+ *      the AST, reconstruct clean SQL via sqlify. Handles CTEs, subqueries, UNION,
+ *      and complex expressions correctly without string heuristics.
+ *   2. **Regex fallback** — for SQL that node-sql-parser cannot handle (e.g.,
+ *      STRING_AGG WITHIN GROUP, certain FOR XML patterns), falls back to the
+ *      original string-based approach with paren-depth tracking.
+ */
+export declare class QueryPagingEngine {
+    /**
+     * Wraps resolved SQL with CTE-based paging for server-side pagination.
+     *
+     * @param resolvedSQL  The fully-resolved SQL (after composition + Nunjucks)
+     * @param startRow     0-based row offset
+     * @param maxRows      Maximum rows to return (page size)
+     * @param platform     Target database platform
+     * @returns DataSQL for paged results and CountSQL for total row count
+     */
+    static WrapWithPaging(resolvedSQL: string, startRow: number, maxRows: number, platform: DatabasePlatform): PagingWrappedSQL;
+    /**
+     * Determines whether the given params indicate paging should be applied.
+     */
+    static ShouldPage(startRow: number | undefined, maxRows: number | undefined): boolean;
+    private static wrapViaAST;
+    /**
+     * Remaps ORDER BY terms to projected column names using AST comparison.
+     *
+     * For each ORDER BY expression, checks the SELECT column list for a match:
+     * 1. If the SELECT column has an AS alias, use the alias
+     * 2. If the SELECT column is a bare column_ref, use the column name
+     * 3. If the ORDER BY is a simple column_ref, strip the table qualifier
+     *
+     * This is more robust than string-based remapping because it works directly
+     * with the parsed AST structure — no regex needed for quoting or prefix stripping.
+     */
+    private static remapOrderByViaAST;
+    /**
+     * Resolves an ORDER BY expression to its projected column name by matching
+     * against the SELECT column list at the AST level.
+     */
+    private static resolveOrderByExpr;
+    /**
+     * Compares two AST expression nodes for structural equality.
+     * Handles column_ref (with table qualifier matching), aggregates, and functions.
+     */
+    private static astExprsMatch;
+    private static extractCTEsFromAST;
+    private static findOrderByStatement;
+    private static wrapViaRegex;
+    static splitCTEAndSelect(sql: string): {
+        ctePrefix: string;
+        mainSelect: string;
+    };
+    static extractOrderBy(sql: string): {
+        sqlWithoutOrder: string;
+        orderByClause: string | null;
+    };
+    static stripTopClause(sql: string): {
+        sql: string;
+        topRemoved: boolean;
+    };
+    private static quoteIdentifier;
+    private static buildPagingClause;
+    static remapOrderByToProjectedNames(orderByClause: string, selectSQL: string): string;
+    private static buildSelectAliasMap;
+    private static splitAtTopLevelCommas;
+    private static defaultOrderBy;
+}
+//# sourceMappingURL=queryPagingEngine.d.ts.map

package/dist/queryPagingEngine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryPagingEngine.d.ts","sourceRoot":"","sources":["../src/queryPagingEngine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,QAAQ,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,iBAAiB;IAE1B;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GAC3B,gBAAgB;IAYnB;;OAEG;IACH,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;IAQrF,OAAO,CAAC,MAAM,CAAC,UAAU;IAuDzB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IA6BjC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;IA2BjC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IA2B5B,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAcjC,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAUnC,OAAO,CAAC,MAAM,CAAC,YAAY;IA8B3B,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;IAgDhF,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE;IA4B7F,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE;IAWxE,OAAO,CAAC,MAAM,CAAC,eAAe;IAI9B,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAMhC,MAAM,CAAC,4BAA4B,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;IAoCrF,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAsClC,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAcpC,OAAO,CAAC,MAAM,CAAC,cAAc;CAGhC"}

package/dist/queryPagingEngine.js

@@ -0,0 +1,399 @@
+import { SQLParser } from '@memberjunction/sql-parser';
+/**
+ * Handles server-side pagination for query SQL by wrapping resolved SQL in CTEs
+ * and applying platform-specific OFFSET/FETCH or LIMIT/OFFSET clauses.
+ *
+ * Uses a two-tier strategy:
+ *   1. **AST path** — parse SQL via node-sql-parser, extract ORDER BY and TOP from
+ *      the AST, reconstruct clean SQL via sqlify. Handles CTEs, subqueries, UNION,
+ *      and complex expressions correctly without string heuristics.
+ *   2. **Regex fallback** — for SQL that node-sql-parser cannot handle (e.g.,
+ *      STRING_AGG WITHIN GROUP, certain FOR XML patterns), falls back to the
+ *      original string-based approach with paren-depth tracking.
+ */
+export class QueryPagingEngine {
+    /**
+     * Wraps resolved SQL with CTE-based paging for server-side pagination.
+     *
+     * @param resolvedSQL  The fully-resolved SQL (after composition + Nunjucks)
+     * @param startRow     0-based row offset
+     * @param maxRows      Maximum rows to return (page size)
+     * @param platform     Target database platform
+     * @returns DataSQL for paged results and CountSQL for total row count
+     */
+    static WrapWithPaging(resolvedSQL, startRow, maxRows, platform) {
+        // Strip trailing semicolons — they break CTE wrapping and OFFSET/FETCH clauses
+        const cleanedSQL = resolvedSQL.trimEnd().replace(/;\s*$/, '');
+        // Tier 1: AST-based paging (robust, handles CTEs/subqueries/UNION correctly)
+        const astResult = QueryPagingEngine.wrapViaAST(cleanedSQL, startRow, maxRows, platform);
+        if (astResult)
+            return astResult;
+        // Tier 2: Regex-based fallback for SQL the parser can't handle
+        return QueryPagingEngine.wrapViaRegex(cleanedSQL, startRow, maxRows, platform);
+    }
+    /**
+     * Determines whether the given params indicate paging should be applied.
+     */
+    static ShouldPage(startRow, maxRows) {
+        return maxRows != null && maxRows > 0 && startRow != null && startRow >= 0;
+    }
+    // ════════════════════════════════════════════════════════════════════
+    // AST-based paging (primary path)
+    // ════════════════════════════════════════════════════════════════════
+    static wrapViaAST(sql, startRow, maxRows, platform) {
+        const parserDialect = platform === 'postgresql' ? 'PostgresQL' : 'TransactSQL';
+        try {
+            const ast = SQLParser.ParseSQL(sql, parserDialect);
+            if (!ast)
+                return null;
+            const stmt = (Array.isArray(ast) ? ast[0] : ast);
+            if (!stmt)
+                return null;
+            // Extract CTEs via AST
+            const cteDefs = QueryPagingEngine.extractCTEsFromAST(stmt, parserDialect, platform);
+            // Extract ORDER BY and remap to projected column names via AST.
+            // The outer query is SELECT * FROM [__paged], so table aliases from the
+            // inner query don't exist. We match ORDER BY expressions against SELECT
+            // columns to find the projected name (AS alias or bare column name).
+            const orderByStmt = QueryPagingEngine.findOrderByStatement(stmt);
+            const selectColumns = (stmt.columns && Array.isArray(stmt.columns))
+                ? stmt.columns
+                : [];
+            const remappedOrderBy = QueryPagingEngine.remapOrderByViaAST(orderByStmt, selectColumns, parserDialect);
+            if (orderByStmt?.orderby) {
+                orderByStmt.orderby = null;
+            }
+            // Strip TOP
+            if (stmt.top)
+                stmt.top = null;
+            // Get main SELECT without CTEs or ORDER BY
+            stmt.with = null;
+            const mainSelectSQL = SQLParser.SqlifyAST(stmt, parserDialect);
+            // Assemble paged query (skip string-based remapping — already done via AST)
+            const pagingCTEName = QueryPagingEngine.quoteIdentifier('__paged', platform);
+            const allCTEs = [...cteDefs, `${pagingCTEName} AS (\n${mainSelectSQL}\n)`];
+            const cteChain = `WITH ${allCTEs.join(',\n')}`;
+            const outerOrderBy = remappedOrderBy || QueryPagingEngine.defaultOrderBy(platform);
+            const pagingClause = QueryPagingEngine.buildPagingClause(startRow, maxRows, platform);
+            const dataSQL = `${cteChain}\nSELECT * FROM ${pagingCTEName}\nORDER BY ${outerOrderBy}\n${pagingClause}`;
+            const countSQL = `${cteChain}\nSELECT COUNT(*) AS TotalRowCount FROM ${pagingCTEName}`;
+            return { DataSQL: dataSQL, CountSQL: countSQL, Offset: startRow, PageSize: maxRows };
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * Remaps ORDER BY terms to projected column names using AST comparison.
+     *
+     * For each ORDER BY expression, checks the SELECT column list for a match:
+     * 1. If the SELECT column has an AS alias, use the alias
+     * 2. If the SELECT column is a bare column_ref, use the column name
+     * 3. If the ORDER BY is a simple column_ref, strip the table qualifier
+     *
+     * This is more robust than string-based remapping because it works directly
+     * with the parsed AST structure — no regex needed for quoting or prefix stripping.
+     */
+    static remapOrderByViaAST(orderByStmt, selectColumns, parserDialect) {
+        if (!orderByStmt?.orderby || !Array.isArray(orderByStmt.orderby))
+            return null;
+        const orderByTerms = orderByStmt.orderby;
+        const remappedTerms = orderByTerms.map(orderTerm => {
+            const direction = orderTerm.type === 'DESC' ? ' DESC' : '';
+            const projectedName = QueryPagingEngine.resolveOrderByExpr(orderTerm.expr, selectColumns);
+            if (projectedName) {
+                return projectedName + direction;
+            }
+            // Fallback: if it's a simple column_ref, strip the table qualifier
+            if (orderTerm.expr.type === 'column_ref') {
+                return orderTerm.expr.column + direction;
+            }
+            // Last resort: convert via ExprToSQL (will have correct quoting at least)
+            return SQLParser.ExprToSQL(orderTerm.expr, parserDialect) + direction;
+        });
+        return remappedTerms.join(', ');
+    }
+    /**
+     * Resolves an ORDER BY expression to its projected column name by matching
+     * against the SELECT column list at the AST level.
+     */
+    static resolveOrderByExpr(orderExpr, selectColumns) {
+        for (const col of selectColumns) {
+            if (!col.expr)
+                continue;
+            // Check if the ORDER BY expression matches this SELECT column's expression
+            if (QueryPagingEngine.astExprsMatch(orderExpr, col.expr)) {
+                // If the column has an AS alias, use it
+                if (col.as)
+                    return col.as;
+                // If it's a bare column_ref, use the column name
+                if (col.expr.type === 'column_ref')
+                    return col.expr.column;
+            }
+            // Also check: ORDER BY references a column by name that matches an AS alias
+            if (orderExpr.type === 'column_ref' && col.as) {
+                const orderCol = orderExpr.column;
+                if (orderCol.toLowerCase() === col.as.toLowerCase()) {
+                    return col.as;
+                }
+            }
+        }
+        return null;
+    }
+    /**
+     * Compares two AST expression nodes for structural equality.
+     * Handles column_ref (with table qualifier matching), aggregates, and functions.
+     */
+    static astExprsMatch(a, b) {
+        if (!a || !b)
+            return false;
+        if (a.type !== b.type)
+            return false;
+        // column_ref: match by column name (ignore table qualifier — the whole point
+        // of remapping is that table qualifiers don't exist in the outer query)
+        if (a.type === 'column_ref') {
+            return a.column?.toLowerCase() === b.column?.toLowerCase() &&
+                a.table?.toLowerCase() === b.table?.toLowerCase();
+        }
+        // For aggregate functions (COUNT, SUM, etc.), compare name and args
+        if (a.type === 'aggr_func') {
+            if (a.name !== b.name)
+                return false;
+            return JSON.stringify(a.args) === JSON.stringify(b.args);
+        }
+        // For regular functions, compare name and args
+        if (a.type === 'function') {
+            return JSON.stringify(a.name) === JSON.stringify(b.name) &&
+                JSON.stringify(a.args) === JSON.stringify(b.args);
+        }
+        // Generic fallback: JSON deep equality (works for simple expressions)
+        return JSON.stringify(a) === JSON.stringify(b);
+    }
+    static extractCTEsFromAST(stmt, parserDialect, platform) {
+        const ctes = stmt.with || [];
+        return ctes.map(cte => {
+            const cteRecord = cte;
+            const quotedName = QueryPagingEngine.quoteIdentifier(cteRecord.name.value, platform);
+            const bodySQL = SQLParser.SqlifyAST(cteRecord.stmt.ast, parserDialect);
+            return `${quotedName} AS (\n${bodySQL}\n)`;
+        });
+    }
+    static findOrderByStatement(stmt) {
+        if (stmt.orderby)
+            return stmt;
+        if (stmt._next)
+            return QueryPagingEngine.findOrderByStatement(stmt._next);
+        return null;
+    }
+    // ════════════════════════════════════════════════════════════════════
+    // Regex-based paging (fallback)
+    // ════════════════════════════════════════════════════════════════════
+    static wrapViaRegex(sql, startRow, maxRows, platform) {
+        const { ctePrefix, mainSelect } = QueryPagingEngine.splitCTEAndSelect(sql);
+        const { sqlWithoutOrder, orderByClause } = QueryPagingEngine.extractOrderBy(mainSelect);
+        const { sql: cleanSelect } = QueryPagingEngine.stripTopClause(sqlWithoutOrder);
+        const pagingCTEName = QueryPagingEngine.quoteIdentifier('__paged', platform);
+        const existingCTEs = ctePrefix ? ctePrefix + ',\n' : 'WITH ';
+        const cteChain = `${existingCTEs}${pagingCTEName} AS (\n${cleanSelect}\n)`;
+        const rawOrderBy = orderByClause || QueryPagingEngine.defaultOrderBy(platform);
+        const outerOrderBy = orderByClause
+            ? QueryPagingEngine.remapOrderByToProjectedNames(rawOrderBy, cleanSelect)
+            : rawOrderBy;
+        const pagingClause = QueryPagingEngine.buildPagingClause(startRow, maxRows, platform);
+        const dataSQL = `${cteChain}\nSELECT * FROM ${pagingCTEName}\nORDER BY ${outerOrderBy}\n${pagingClause}`;
+        const countSQL = `${cteChain}\nSELECT COUNT(*) AS TotalRowCount FROM ${pagingCTEName}`;
+        return { DataSQL: dataSQL, CountSQL: countSQL, Offset: startRow, PageSize: maxRows };
+    }
+    // ════════════════════════════════════════════════════════════════════
+    // Regex helpers (used by fallback path)
+    // ════════════════════════════════════════════════════════════════════
+    static splitCTEAndSelect(sql) {
+        const trimmed = sql.trim();
+        if (!/^WITH\s/i.test(trimmed)) {
+            return { ctePrefix: '', mainSelect: trimmed };
+        }
+        let depth = 0;
+        let lastCTEEnd = -1;
+        let i = 0;
+        const withMatch = trimmed.match(/^WITH\s+/i);
+        if (!withMatch)
+            return { ctePrefix: '', mainSelect: trimmed };
+        i = withMatch[0].length;
+        while (i < trimmed.length) {
+            const ch = trimmed[i];
+            if (ch === '(') {
+                depth++;
+            }
+            else if (ch === ')') {
+                depth--;
+                if (depth === 0) {
+                    lastCTEEnd = i;
+                    const rest = trimmed.substring(i + 1).trimStart();
+                    if (rest.startsWith(',')) {
+                        i = trimmed.indexOf(',', i + 1) + 1;
+                        continue;
+                    }
+                    break;
+                }
+            }
+            else if (ch === "'" && depth > 0) {
+                i++;
+                while (i < trimmed.length && trimmed[i] !== "'") {
+                    if (trimmed[i] === "'" && i + 1 < trimmed.length && trimmed[i + 1] === "'") {
+                        i += 2;
+                    }
+                    else {
+                        i++;
+                    }
+                }
+            }
+            i++;
+        }
+        if (lastCTEEnd === -1)
+            return { ctePrefix: '', mainSelect: trimmed };
+        return {
+            ctePrefix: trimmed.substring(0, lastCTEEnd + 1).trim(),
+            mainSelect: trimmed.substring(lastCTEEnd + 1).trim(),
+        };
+    }
+    static extractOrderBy(sql) {
+        const upperSQL = sql.toUpperCase();
+        let depth = 0;
+        let lastOrderByPos = -1;
+        for (let i = 0; i < sql.length; i++) {
+            const ch = sql[i];
+            if (ch === '(')
+                depth++;
+            else if (ch === ')')
+                depth--;
+            else if (depth === 0 && i + 8 <= sql.length) {
+                if (upperSQL.substring(i, i + 8) === 'ORDER BY') {
+                    if (i === 0 || /\s/.test(sql[i - 1])) {
+                        lastOrderByPos = i;
+                    }
+                }
+            }
+        }
+        if (lastOrderByPos === -1) {
+            return { sqlWithoutOrder: sql, orderByClause: null };
+        }
+        return {
+            orderByClause: sql.substring(lastOrderByPos + 9).trim(),
+            sqlWithoutOrder: sql.substring(0, lastOrderByPos).trim(),
+        };
+    }
+    static stripTopClause(sql) {
+        const topRegex = /^(SELECT\s+(?:DISTINCT\s+)?)TOP\s+(?:\(\s*\d+\s*\)|\d+)\s+/i;
+        const match = sql.match(topRegex);
+        if (!match)
+            return { sql, topRemoved: false };
+        return { sql: match[1] + sql.substring(match[0].length), topRemoved: true };
+    }
+    // ════════════════════════════════════════════════════════════════════
+    // Shared helpers
+    // ════════════════════════════════════════════════════════════════════
+    static quoteIdentifier(name, platform) {
+        return platform === 'postgresql' ? `"${name}"` : `[${name}]`;
+    }
+    static buildPagingClause(startRow, maxRows, platform) {
+        return platform === 'postgresql'
+            ? `LIMIT ${maxRows} OFFSET ${startRow}`
+            : `OFFSET ${startRow} ROWS FETCH NEXT ${maxRows} ROWS ONLY`;
+    }
+    static remapOrderByToProjectedNames(orderByClause, selectSQL) {
+        const aliasMap = QueryPagingEngine.buildSelectAliasMap(selectSQL);
+        const terms = QueryPagingEngine.splitAtTopLevelCommas(orderByClause);
+        const remapped = terms.map(term => {
+            const trimmed = term.trim();
+            const dirMatch = trimmed.match(/\s+(ASC|DESC)(\s+NULLS\s+(FIRST|LAST))?\s*$/i);
+            const expr = dirMatch ? trimmed.substring(0, dirMatch.index).trim() : trimmed;
+            const direction = dirMatch ? dirMatch[0] : '';
+            // Strip bracket/backtick/double-quote quoting for normalized matching.
+            // The AST path produces [bracket]-quoted identifiers, while the alias map
+            // may use either quoted or unquoted forms.
+            const unquoted = expr.replace(/\[([^\]]+)\]/g, '$1').replace(/`([^`]+)`/g, '$1').replace(/"([^"]+)"/g, '$1');
+            const normalizedExpr = unquoted.replace(/\s+/g, ' ').trim();
+            // 1. Try exact match against SELECT expressions
+            const exactMatch = aliasMap.get(normalizedExpr.toUpperCase());
+            if (exactMatch)
+                return exactMatch + direction;
+            // 2. Strip table alias prefixes (handles both quoted and unquoted)
+            const stripped = normalizedExpr.replace(/\b[a-zA-Z_]\w*\./g, '');
+            const strippedMatch = aliasMap.get(stripped.toUpperCase());
+            if (strippedMatch)
+                return strippedMatch + direction;
+            // 3. Simple table.column — return just the column name
+            const dotMatch = normalizedExpr.match(/^[a-zA-Z_]\w*\.([a-zA-Z_]\w*)$/);
+            if (dotMatch)
+                return dotMatch[1] + direction;
+            // 4. Fallback: return stripped expression
+            return stripped + direction;
+        });
+        return remapped.join(', ');
+    }
+    static buildSelectAliasMap(selectSQL) {
+        const map = new Map();
+        const stripped = selectSQL.replace(/^(\s*(--[^\n]*\n|\/\*[\s\S]*?\*\/))*\s*/i, '');
+        const selectMatch = stripped.match(/^SELECT\s+(?:DISTINCT\s+)?/i);
+        if (!selectMatch)
+            return map;
+        const afterSelect = stripped.substring(selectMatch[0].length);
+        const upperAfter = afterSelect.toUpperCase();
+        let depth = 0;
+        let fromPos = -1;
+        for (let i = 0; i < afterSelect.length; i++) {
+            const ch = afterSelect[i];
+            if (ch === '(')
+                depth++;
+            else if (ch === ')')
+                depth--;
+            else if (depth === 0 && i + 5 <= afterSelect.length) {
+                if (upperAfter.substring(i, i + 5) === 'FROM ' || upperAfter.substring(i, i + 5) === 'FROM\n' || upperAfter.substring(i, i + 5) === 'FROM\t') {
+                    if (i === 0 || /\s/.test(afterSelect[i - 1])) {
+                        fromPos = i;
+                        break;
+                    }
+                }
+            }
+        }
+        const columnList = fromPos === -1 ? afterSelect : afterSelect.substring(0, fromPos);
+        for (const item of QueryPagingEngine.splitAtTopLevelCommas(columnList)) {
+            const trimmedItem = item.trim();
+            if (!trimmedItem)
+                continue;
+            const asMatch = trimmedItem.match(/\s+AS\s+(\[?\w+\]?)\s*$/i);
+            if (asMatch) {
+                const exprPart = trimmedItem.substring(0, asMatch.index).trim();
+                const alias = asMatch[1].replace(/[[\]]/g, '');
+                const normalizedExpr = exprPart.replace(/\s+/g, ' ').toUpperCase();
+                map.set(normalizedExpr, alias);
+                const strippedExpr = normalizedExpr.replace(/\b[A-Z_]\w*\./g, '');
+                if (strippedExpr !== normalizedExpr)
+                    map.set(strippedExpr, alias);
+            }
+        }
+        return map;
+    }
+    static splitAtTopLevelCommas(sql) {
+        const parts = [];
+        let depth = 0;
+        let start = 0;
+        for (let i = 0; i < sql.length; i++) {
+            const ch = sql[i];
+            if (ch === '(')
+                depth++;
+            else if (ch === ')')
+                depth--;
+            else if (ch === ',' && depth === 0) {
+                parts.push(sql.substring(start, i));
+                start = i + 1;
+            }
+        }
+        parts.push(sql.substring(start));
+        return parts;
+    }
+    static defaultOrderBy(platform) {
+        return platform === 'postgresql' ? '1' : '(SELECT NULL)';
+    }
+}
+//# sourceMappingURL=queryPagingEngine.js.map

package/dist/queryPagingEngine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queryPagingEngine.js","sourceRoot":"","sources":["../src/queryPagingEngine.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -35,6 +35,19 @@ export interface SqlLoggingOptions {
     sessionName?: string;
     /** Whether to output verbose debug information to console (default: false) */
     verboseOutput?: boolean;
+    /**
+     * When set, enables variable-count-based batch separation instead of emitting the batch separator
+     * after every statement. The logger tracks how many SQL variable declarations (DECLARE @...) have
+     * accumulated in the current batch. When the running count reaches this threshold, a batch separator
+     * is emitted before the next statement and the counter resets.
+     *
+     * This prevents SQL Server's 10,000-variable-per-batch limit from being hit on large migration files
+     * while avoiding the verbosity of one GO per statement.
+     *
+     * Requires `batchSeparator` to also be set. Recommended value: 200.
+     * Set to 0 or leave undefined to use the legacy per-statement behavior.
+     */
+    variableBatchThreshold?: number;
     /**
      * Array of patterns to filter SQL statements.
      * Supports both regex (RegExp objects) and simple wildcard patterns (strings).

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2GAA2G;IAC3G,cAAc,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;IAClD,wFAAwF;IACxF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oEAAoE;IACpE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,4IAA4I;IAC5I,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,oJAAoJ;IACpJ,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,kFAAkF;IAClF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACrC;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,wBAAwB;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,yBAAyB;IACzB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,yCAAyC;IACzC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,4DAA4D;IAC5D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2GAA2G;IAC3G,cAAc,CAAC,EAAE,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;IAClD,wFAAwF;IACxF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oEAAoE;IACpE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,4IAA4I;IAC5I,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,oJAAoJ;IACpJ,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,kFAAkF;IAClF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8EAA8E;IAC9E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;;;;;;OAWG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;;;;;;;;;;;OAaG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACrC;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,wBAAwB;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0CAA0C;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,yBAAyB;IACzB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,yCAAyC;IACzC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,6CAA6C;IAC7C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,4DAA4D;IAC5D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@memberjunction/generic-database-provider",
   "type": "module",
-  "version": "5.14.0",
+  "version": "5.16.0",
   "description": "Shared database provider logic for MemberJunction — intermediate base class between DatabaseProviderBase and platform-specific providers",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,17 +22,17 @@
     "vitest": "^3.1.1"
   },
   "dependencies": {
-    "@memberjunction/actions": "5.14.0",
-    "@memberjunction/actions-base": "5.14.0",
-    "@memberjunction/aiengine": "5.14.0",
-    "@memberjunction/core": "5.14.0",
-    "@memberjunction/core-entities": "5.14.0",
-    "@memberjunction/encryption": "5.14.0",
-    "@memberjunction/global": "5.14.0",
-    "@memberjunction/query-processor": "5.14.0",
-    "@memberjunction/sql-dialect": "5.14.0",
-    "node-sql-parser": "^5.4.0",
-    "@memberjunction/queue": "5.14.0",
+    "@memberjunction/actions": "5.16.0",
+    "@memberjunction/actions-base": "5.16.0",
+    "@memberjunction/aiengine": "5.16.0",
+    "@memberjunction/core": "5.16.0",
+    "@memberjunction/core-entities": "5.16.0",
+    "@memberjunction/encryption": "5.16.0",
+    "@memberjunction/global": "5.16.0",
+    "@memberjunction/query-processor": "5.16.0",
+    "@memberjunction/sql-dialect": "5.16.0",
+    "@memberjunction/sql-parser": "5.16.0",
+    "@memberjunction/queue": "5.16.0",
     "sql-formatter": "^15.7.0",
     "uuid": "^13.0.0"
   },