@hypequery/datasets 0.23.1 → 0.25.0

package/dist/utils/time-measure-axis-sql.js

@@ -1,42 +1,40 @@
-import { GRAIN_FUNCTIONS } from '../constants.js';
-import { addTimeSql as add, subtractTimeSql as subtract } from './time-arithmetic-sql.js';
+import { sourceTimezoneSql } from './time-measure-source-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
 import { shiftCalendarGuardSql, shiftWallTimeSeriesGuardSql } from './shift-measure-sql.js';
-function literal(value) {
-    return `'${value.replace(/\\/g, '\\\\').replace(/'/g, "''")}'`;
-}
 /** Build bounded output buckets using the query timezone. */
-export function buildTimeMeasureAxisSql(source, axis, shifts = []) {
-    const first = `${GRAIN_FUNCTIONS[axis.grain]}(_hq_lower)`;
-    const upperBucket = `${GRAIN_FUNCTIONS[axis.grain]}(_hq_upper)`;
+export function buildTimeMeasureAxisSql(statement, source, axis, shifts = []) {
+    const { dialect } = statement;
+    const first = dialect.truncateTime('_hq_lower', axis.grain);
+    const upperBucket = dialect.truncateTime('_hq_upper', axis.grain);
     const last = axis.upperInclusive
         ? upperBucket
-        : `if(_hq_upper = ${upperBucket}, ${subtract(upperBucket, 1, axis.grain)}, ${upperBucket})`;
-    const count = `dateDiff('${axis.grain}', _hq_first, _hq_last) + 1`;
+        : dialect.ifElse(`_hq_upper = ${upperBucket}`, dialect.subtractTime(upperBucket, 1, axis.grain), upperBucket);
+    const count = `${dialect.timeDiff(axis.grain, '_hq_first', '_hq_last')} + 1`;
     const emptyRange = axis.lowerInclusive && axis.upperInclusive ? '' : ' OR _hq_lower = _hq_upper';
-    const rangeGuard = `throwIf(_hq_lower > _hq_upper${emptyRange}, 'Window measure time range must be non-empty and ordered.')`;
+    const rangeGuard = dialect.guard(`_hq_lower > _hq_upper${emptyRange}`, 'Window measure time range must be non-empty and ordered.');
     const limitGuard = axis.resultLimit === undefined
         ? '0'
-        : `throwIf(${count} > ${axis.resultLimit}, 'Window series exceeds the effective result limit of ${axis.resultLimit} buckets.')`;
-    const calendarGuard = calendarBucketGuardSql('_hq_first', `${count} + ${limitGuard} + ${rangeGuard}`, axis.grain);
-    const physicalTimeType = `toTypeName(tupleElement((SELECT ${source.rowAlias} FROM _hq_raw LIMIT 0), 1))`;
+        : dialect.guard(`${count} > ${axis.resultLimit}`, `Window series exceeds the effective result limit of ${axis.resultLimit} buckets.`);
+    const calendarGuard = calendarBucketGuardSql(dialect, '_hq_first', `${count} + ${limitGuard} + ${rangeGuard}`, axis.grain);
+    const physicalTime = dialect.rowElement(`(SELECT ${source.rowAlias} FROM _hq_raw LIMIT 0)`, 1);
     const physicalGuard = axis.grain === 'minute' || axis.grain === 'hour'
-        ? `throwIf(position(${physicalTimeType}, 'Date') > 0 AND position(${physicalTimeType}, 'DateTime') = 0, 'Sub-day time measures require a time-of-day column; Date and Date32 are not supported.')`
+        ? dialect.guard(dialect.isDateOnlyType(physicalTime), 'Sub-day time measures require a time-of-day column; Date and Date32 are not supported.')
         : '0';
-    const shiftGuards = shifts.map(shift => shiftCalendarGuardSql(shift, axis, `${limitGuard} + ${rangeGuard}`));
+    const shiftGuards = shifts.map(shift => shiftCalendarGuardSql(dialect, shift, axis, `${limitGuard} + ${rangeGuard}`));
     const guard = [limitGuard, physicalGuard, calendarGuard, ...shiftGuards].join(' + ');
-    const postSeriesGuard = shifts.map(shift => shiftWallTimeSeriesGuardSql(shift, axis.grain)).join(' + ') || '0';
+    const postSeriesGuard = shifts.map(shift => shiftWallTimeSeriesGuardSql(dialect, shift, axis.grain)).join(' + ') || '0';
     // A zero-row scalar retains the converted timestamp type and query timezone.
     // Reading any(time) here would scan the entire population just for its type.
-    const timezone = 'timezoneOf(assumeNotNull((SELECT _hq_time FROM _hq_source LIMIT 0)))';
+    const timezone = sourceTimezoneSql(dialect);
     const bounds = [
-        `parseDateTime64BestEffort(${literal(axis.lower)}, 9, ${timezone}) AS _hq_lower`,
-        `parseDateTime64BestEffort(${literal(axis.upper)}, 9, ${timezone}) AS _hq_upper`,
+        // The bounds come from the caller's time filter: bind them, never inline them.
+        `${dialect.parseTimestamp(statement.bind(axis.lower, 'string'), timezone)} AS _hq_lower`,
+        `${dialect.parseTimestamp(statement.bind(axis.upper, 'string'), timezone)} AS _hq_upper`,
         `${first} AS _hq_first`,
         `${last} AS _hq_last`,
     ];
-    const bucketIndices = `arrayJoin(range(toUInt64(${count} + ${guard} + ${rangeGuard})))`;
-    const period = add('_hq_first', bucketIndices, axis.grain);
+    const bucketIndices = dialect.seriesIndex(`${count} + ${guard} + ${rangeGuard}`);
+    const period = dialect.addTime('_hq_first', bucketIndices, axis.grain);
     const ctes = [
         `_hq_bounds AS (SELECT ${bounds.join(', ')})`,
         `_hq_series AS (SELECT ${period} AS _hq_period FROM _hq_bounds)`,

package/dist/utils/time-measure-context-sql.d.ts

@@ -1,6 +1,7 @@
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
 import type { MeasureEvaluationContext } from './measure-evaluation-graph.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
 /** Keep output coordinates separate from each shifted evaluation interval. */
-export declare function timeMeasureContextCtes(contexts: readonly MeasureEvaluationContext[], axis: TimeMeasureAxis): string[];
-export declare function timeMeasureContextGuard(context: MeasureEvaluationContext, axis: TimeMeasureAxis): string;
+export declare function timeMeasureContextCtes(dialect: DatasetSqlDialectRules, contexts: readonly MeasureEvaluationContext[], axis: TimeMeasureAxis): string[];
+export declare function timeMeasureContextGuard(dialect: DatasetSqlDialectRules, context: MeasureEvaluationContext, axis: TimeMeasureAxis): string;
 //# sourceMappingURL=time-measure-context-sql.d.ts.map

package/dist/utils/time-measure-context-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-context-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-context-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAO9D,8EAA8E;AAC9E,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,SAAS,wBAAwB,EAAE,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE,CAerH;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,CAOxG"}
+{"version":3,"file":"time-measure-context-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-context-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,8EAA8E;AAC9E,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,SAAS,wBAAwB,EAAE,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,EAAE,CAgBtJ;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,wBAAwB,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,CAOzI"}

package/dist/utils/time-measure-context-sql.js

@@ -1,27 +1,27 @@
-import { addTimeSql as add, subtractTimeSql as subtract } from './time-arithmetic-sql.js';
 import { calendarShiftAtFineGrain } from './shift-measure-grains.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
 import { shiftWallTimeGuardSql } from './shift-wall-time-sql.js';
 import { anchoredCalendarShiftSql } from './calendar-shift-sql.js';
 /** Keep output coordinates separate from each shifted evaluation interval. */
-export function timeMeasureContextCtes(contexts, axis) {
-    const end = add('_hq_period', 1, axis.grain);
-    const root = `_hq_context0 AS (SELECT _hq_period, _hq_period AS _hq_eval_period, ${end} AS _hq_eval_end, greatest(_hq_period, _hq_lower) AS _hq_eval_lower, least(${end}, _hq_upper) AS _hq_eval_upper, (_hq_period > _hq_lower OR ${Number(axis.lowerInclusive)}) AS _hq_lower_inclusive, (_hq_upper < ${end} AND ${Number(axis.upperInclusive)}) AS _hq_upper_inclusive FROM _hq_series CROSS JOIN _hq_bounds)`;
+export function timeMeasureContextCtes(dialect, contexts, axis) {
+    const end = dialect.addTime('_hq_period', 1, axis.grain);
+    const root = `_hq_context0 AS (SELECT _hq_period, _hq_period AS _hq_eval_period, ${end} AS _hq_eval_end, ${dialect.greatest('_hq_period', '_hq_lower')} AS _hq_eval_lower, ${dialect.least(end, '_hq_upper')} AS _hq_eval_upper, (_hq_period > _hq_lower OR ${Number(axis.lowerInclusive)}) AS _hq_lower_inclusive, (_hq_upper < ${end} AND ${Number(axis.upperInclusive)}) AS _hq_upper_inclusive FROM _hq_series CROSS JOIN _hq_bounds)`;
     return [root, ...contexts.slice(1).map(context => {
             const interval = context.interval;
             const calendar = calendarShiftAtFineGrain(interval, axis.grain);
-            const shift = (value) => subtract(`p.${value}`, interval.amount, interval.unit);
+            const shift = (value) => dialect.subtractTime(`p.${value}`, interval.amount, interval.unit);
             // Partial bounds stay inside the shifted bucket; see anchoredCalendarShiftSql.
             const shiftBound = (value) => calendar
-                ? anchoredCalendarShiftSql(`p.${value}`, 'p._hq_eval_period', interval)
+                ? anchoredCalendarShiftSql(dialect, `p.${value}`, 'p._hq_eval_period', interval)
                 : shift(value);
             const period = shift('_hq_eval_period');
-            const shiftedEnd = calendar ? add(period, 1, axis.grain) : shift('_hq_eval_end');
-            return `_hq_context${context.id} AS (SELECT p._hq_period, ${period} AS _hq_eval_period, ${shiftedEnd} AS _hq_eval_end, ${shiftBound('_hq_eval_lower')} AS _hq_eval_lower, if(p._hq_eval_upper = p._hq_eval_end, ${shiftedEnd}, ${shiftBound('_hq_eval_upper')}) AS _hq_eval_upper, p._hq_lower_inclusive, p._hq_upper_inclusive FROM _hq_context${context.parent} AS p)`;
+            const shiftedEnd = calendar ? dialect.addTime(period, 1, axis.grain) : shift('_hq_eval_end');
+            const upper = dialect.ifElse('p._hq_eval_upper = p._hq_eval_end', shiftedEnd, shiftBound('_hq_eval_upper'));
+            return `_hq_context${context.id} AS (SELECT p._hq_period, ${period} AS _hq_eval_period, ${shiftedEnd} AS _hq_eval_end, ${shiftBound('_hq_eval_lower')} AS _hq_eval_lower, ${upper} AS _hq_eval_upper, p._hq_lower_inclusive, p._hq_upper_inclusive FROM _hq_context${context.parent} AS p)`;
         })];
 }
-export function timeMeasureContextGuard(context, axis) {
-    const guard = calendarBucketGuardSql('_hq_eval_period', '1', axis.grain);
-    const wallTimeGuard = context.interval === undefined ? '0' : shiftWallTimeGuardSql(context.interval, axis.grain, `_hq_context${context.parent} AS p`, 'p._hq_eval_period', 'p._hq_eval_lower', 'p._hq_eval_upper', 'p._hq_eval_end');
+export function timeMeasureContextGuard(dialect, context, axis) {
+    const guard = calendarBucketGuardSql(dialect, '_hq_eval_period', '1', axis.grain);
+    const wallTimeGuard = context.interval === undefined ? '0' : shiftWallTimeGuardSql(dialect, context.interval, axis.grain, `_hq_context${context.parent} AS p`, 'p._hq_eval_period', 'p._hq_eval_lower', 'p._hq_eval_upper', 'p._hq_eval_end');
     return `(SELECT coalesce(max(${guard}), 0) FROM _hq_context${context.id}) + ${wallTimeGuard}`;
 }

package/dist/utils/time-measure-dataset-sql.d.ts

@@ -1,9 +1,11 @@
 import type { AnyDatasetInstance, DatasetQuery } from '../types.js';
 import type { DatasetQueryExecutionOptions } from '../dataset-query.js';
+import { type PlannedStatement } from './statement-parameters.js';
+/** A time-measure statement and the axis check that must run before it. */
+export interface PlannedTimeMeasureStatements {
+    readonly statement: PlannedStatement;
+    readonly preflight: PlannedStatement;
+}
 /** Plan source rows → output axis → window/shift values → final projection. */
-export declare function buildTimeMeasureDatasetSql(ds: AnyDatasetInstance, query: DatasetQuery, options: DatasetQueryExecutionOptions): {
-    sql: string;
-    parameters: unknown[];
-    timeAxisSql: string;
-};
+export declare function buildTimeMeasureDatasetSql(ds: AnyDatasetInstance, query: DatasetQuery, options: DatasetQueryExecutionOptions): PlannedTimeMeasureStatements;
 //# sourceMappingURL=time-measure-dataset-sql.d.ts.map

package/dist/utils/time-measure-dataset-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-dataset-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-dataset-sql.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAYxE,+EAA+E;AAC/E,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,GACpC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAmE7D"}
+{"version":3,"file":"time-measure-dataset-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-dataset-sql.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAOxE,OAAO,EAAuB,KAAK,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAOvF,2EAA2E;AAC3E,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;CACtC;AAED,+EAA+E;AAC/E,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,GACpC,4BAA4B,CAsE9B"}

package/dist/utils/time-measure-dataset-sql.js

@@ -5,7 +5,9 @@ import { getBaseMeasure, getDerivedMeasure, isShiftMeasure, isWindowMeasure } fr
 import { selectedTimeMeasures } from './time-query-measures.js';
 import { analyzeTimeMeasureAxis } from './time-measure-axis.js';
 import { validateDatasetQueryInput } from './dataset-query-validation.js';
-import { addTimeSql as add } from './time-arithmetic-sql.js';
+import { resolveDatasetSqlDialect } from './dataset-sql-dialect.js';
+import { assertRawSqlForDialect } from './raw-sql-dialect-check.js';
+import { StatementParameters } from './statement-parameters.js';
 import { shiftBucketCtes } from './shift-measure-sql.js';
 import { buildTimeMeasureSourceSql } from './time-measure-source-sql.js';
 import { buildTimeMeasureAxisSql } from './time-measure-axis-sql.js';
@@ -16,6 +18,8 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
     const validation = validateDatasetQueryInput(ds, query, options.context);
     if (!validation.valid)
         throw new Error(`Invalid dataset query: ${validation.errors.join('; ')}`);
+    const dialect = resolveDatasetSqlDialect(options.builderFactory);
+    assertRawSqlForDialect(ds, dialect);
     const { axis } = analyzeTimeMeasureAxis(ds, query);
     if (!axis || !ds.timeKey)
         throw new Error('Window measures require a bounded time axis.');
@@ -27,8 +31,9 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
         const derived = getDerivedMeasure(ds.measures, name);
         return derived && Object.values(derived.uses).some(input => getDerivedMeasure(ds.measures, input));
     });
+    const parameters = new StatementParameters(dialect);
     if (composite)
-        return buildCompositeTimeMeasureSql(ds, query, options, axis);
+        return buildCompositeTimeMeasureSql(ds, query, options, axis, parameters);
     const timeMeasures = selectedTimeMeasures(ds, query);
     const windows = [...timeMeasures.values()].filter(isWindowMeasure);
     const shifts = [...timeMeasures.values()].filter(isShiftMeasure);
@@ -39,25 +44,25 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
             Object.values(derived.uses).forEach(input => needed.add(input));
     }
     const baseNames = new Set([...needed].map(name => timeMeasures.get(name)?.measure ?? name));
-    const source = buildTimeMeasureSourceSql(ds, query, baseNames, axis.filters, options);
-    const timeAxis = buildTimeMeasureAxisSql(source, axis, shifts);
+    const source = buildTimeMeasureSourceSql(ds, query, baseNames, axis.filters, options, parameters);
+    const timeAxis = buildTimeMeasureAxisSql(parameters, source, axis, shifts);
     const shiftedInputs = new Map();
     [...needed].forEach((name, index) => {
         const measure = timeMeasures.get(name);
         if (isShiftMeasure(measure))
-            shiftedInputs.set(name, shiftBucketCtes(measure, axis, index));
+            shiftedInputs.set(name, shiftBucketCtes(dialect, measure, axis, index));
     });
     // Scan only requested populations: intervening rows must not introduce dimensions.
-    const end = add('_hq_last', 1, axis.grain);
+    const end = dialect.addTime('_hq_last', 1, axis.grain);
     const populations = [];
     if ([...needed].some(name => name.includes('.') || getBaseMeasure(ds.measures, name))) {
         populations.push(`(_hq_time >= _hq_first AND _hq_time < ${end})`);
     }
     if (windows.length) {
         const starts = windows.filter(window => !window.cumulative)
-            .map(window => windowScanStartSql(window, axis.grain));
+            .map(window => windowScanStartSql(dialect, window, axis.grain));
         const lower = windows.some(window => window.cumulative)
-            ? '' : ` AND _hq_time >= least(${starts.join(', ')})`;
+            ? '' : ` AND _hq_time >= ${dialect.least(...starts)}`;
         populations.push(`(_hq_time < ${end}${lower})`);
     }
     for (const shifted of shiftedInputs.values())
@@ -73,9 +78,9 @@ export function buildTimeMeasureDatasetSql(ds, query, options) {
             const shifted = shiftedInputs.get(name);
             return { name, base, rowsSql: shifted.rowsSql, restrictToAxis: false };
         }
-        return { name, base, window, rowsSql: windowMeasureRowsSql(window, axis) };
+        return { name, base, window, rowsSql: windowMeasureRowsSql(dialect, window, axis) };
     });
-    const values = buildTimeMeasureValuesSql(source.dimensions, inputs, axis);
-    const sql = buildTimeMeasureResultSql(ds, query, options, source.dimensions, [...source.ctes, ...timeAxis.ctes, ...[...shiftedInputs.values()].flatMap(input => input.ctes), scanCte, ...values], `${timeAxis.guard} + ${timeAxis.rangeGuard} + ${timeAxis.postSeriesGuard}`);
-    return { sql, parameters: source.parameters, timeAxisSql: timeAxis.timeAxisSql };
+    const values = buildTimeMeasureValuesSql(dialect, source.dimensions, inputs, axis);
+    const text = buildTimeMeasureResultSql(ds, query, options, source.dimensions, [...source.ctes, ...timeAxis.ctes, ...[...shiftedInputs.values()].flatMap(input => input.ctes), scanCte, ...values], `${timeAxis.guard} + ${timeAxis.rangeGuard} + ${timeAxis.postSeriesGuard}`);
+    return { statement: { text, parameters }, preflight: { text: timeAxis.timeAxisSql, parameters } };
 }

package/dist/utils/time-measure-leaf-sql.d.ts

@@ -1,8 +1,9 @@
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
 import type { WindowMeasureDefinition } from '../types.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
-import type { TimeMeasureSqlBase, TimeMeasureSqlDimension } from './time-measure-source-sql.js';
+import { type TimeMeasureSqlBase, type TimeMeasureSqlDimension } from './time-measure-source-sql.js';
 /** Keyed source membership retains distinct/average semantics and row multiplicity. */
-export declare function timeMeasureLeafSql(id: number, context: number, base: TimeMeasureSqlBase, window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis, dims: readonly TimeMeasureSqlDimension[]): {
+export declare function timeMeasureLeafSql(dialect: DatasetSqlDialectRules, id: number, context: number, base: TimeMeasureSqlBase, window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis, dims: readonly TimeMeasureSqlDimension[]): {
     ctes: string[];
     population: string;
     aggregate: string;

package/dist/utils/time-measure-leaf-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-leaf-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-leaf-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAMhG,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,uBAAuB,EAAE;;;;;;;;EA6CrM"}
+{"version":3,"file":"time-measure-leaf-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-leaf-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAqB,KAAK,kBAAkB,EAAE,KAAK,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKxH,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,uBAAuB,EAAE;;;;;;;;EA+CtO"}

package/dist/utils/time-measure-leaf-sql.js

@@ -1,50 +1,51 @@
-import { GRAIN_FUNCTIONS } from '../constants.js';
-import { addTimeSql as add, subtractTimeSql as subtract } from './time-arithmetic-sql.js';
+import { sourceTimezoneSql } from './time-measure-source-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
 import { shiftRangePredicateSql } from './shift-measure-sql.js';
-import { isCountAggregation, windowAggregateSql } from './window-aggregation-sql.js';
+import { isCountAggregation } from './count-aggregations.js';
 /** Keyed source membership retains distinct/average semantics and row multiplicity. */
-export function timeMeasureLeafSql(id, context, base, window, axis, dims) {
+export function timeMeasureLeafSql(dialect, id, context, base, window, axis, dims) {
     const keys = dims.map(dim => dim.alias);
     const ranges = `_hq_ranges${id}`;
     const rows = `_hq_rows${id}`;
     const aggregate = `_hq_leaf${id}`;
     const value = `_hq_value${id}`;
     const group = `_hq_period${keys.length ? `, ${keys.join(', ')}` : ''}`;
-    const expression = windowAggregateSql(base.definition, base.value, base.arg);
+    const expression = dialect.windowAggregate(base.definition, base.value, base.arg);
     if (window?.cumulative) {
         const population = `_hq_history${id}`;
         const partial = `_hq_partial${id}`;
         const operation = base.definition.aggregation === 'count' ? 'sum' : base.definition.aggregation;
-        const partition = keys.length ? `tuple(${keys.join(', ')})` : 'tuple(0)';
+        const partition = dialect.packRow(keys.length ? keys : ['0']);
         const historyGroup = `_hq_time${keys.length ? `, ${keys.join(', ')}` : ''}`;
         return {
             ctes: [
                 `${population} AS (SELECT * FROM _hq_source WHERE _hq_time < (SELECT max(_hq_eval_end) FROM _hq_context${context}))`,
-                `${partial} AS (SELECT ${historyGroup}, ${partition} AS _hq_partition, toNullable(${expression}) AS _hq_partial FROM ${population} GROUP BY ${historyGroup})`,
-                `${aggregate} AS (SELECT _hq_time, _hq_partition, ${operation}OrNull(_hq_partial) OVER (PARTITION BY _hq_partition ORDER BY _hq_time ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS ${value} FROM ${partial})`,
+                `${partial} AS (SELECT ${historyGroup}, ${partition} AS _hq_partition, ${dialect.toNullable(expression)} AS _hq_partial FROM ${population} GROUP BY ${historyGroup})`,
+                `${aggregate} AS (SELECT _hq_time, _hq_partition, ${dialect.reaggregate(operation, '_hq_partial')} OVER (PARTITION BY _hq_partition ORDER BY _hq_time ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS ${value} FROM ${partial})`,
             ],
             population, aggregate, context, cumulative: true, guard: '0',
             count: isCountAggregation(base.definition),
         };
     }
-    const lower = window?.trailing ? subtract('_hq_eval_end', window.trailing.amount, window.trailing.unit)
-        : window?.toDate ? `${GRAIN_FUNCTIONS[window.toDate]}(_hq_eval_period)` : '_hq_eval_lower';
+    const lower = window?.trailing ? dialect.subtractTime('_hq_eval_end', window.trailing.amount, window.trailing.unit)
+        // Keep the to-date start zoned: a calendar Date would bucket in server time.
+        : window?.toDate ? dialect.truncateTimeInZone('_hq_eval_period', window.toDate, sourceTimezoneSql(dialect)) : '_hq_eval_lower';
     const upper = window ? '_hq_eval_end' : '_hq_eval_upper';
     const lowerInclusive = window ? '1' : '_hq_lower_inclusive';
     const upperInclusive = window ? '0' : '_hq_upper_inclusive';
-    const first = `${GRAIN_FUNCTIONS[axis.grain]}(_hq_scan_lower)`;
-    const last = `${GRAIN_FUNCTIONS[axis.grain]}(_hq_scan_upper)`;
-    const count = `greatest(0, dateDiff('${axis.grain}', ${first}, ${last}) + if(_hq_scan_upper > ${last} OR _hq_scan_upper_inclusive, 1, 0))`;
-    const fanout = window ? `throwIf(${count} > 1000, 'A window row contributes to more than 1000 buckets.')` : '0';
-    const guard = `${fanout} + ${calendarBucketGuardSql(first, `${count} + ${fanout}`, axis.grain)}`;
+    const first = dialect.truncateTime('_hq_scan_lower', axis.grain);
+    const last = dialect.truncateTime('_hq_scan_upper', axis.grain);
+    const partialUpper = dialect.ifElse(`_hq_scan_upper > ${last} OR _hq_scan_upper_inclusive`, '1', '0');
+    const count = dialect.greatest('0', `${dialect.timeDiff(axis.grain, first, last)} + ${partialUpper}`);
+    const fanout = window ? dialect.guard(`${count} > 1000`, 'A window row contributes to more than 1000 buckets.') : '0';
+    const guard = `${fanout} + ${calendarBucketGuardSql(dialect, first, `${count} + ${fanout}`, axis.grain)}`;
     const predicate = shiftRangePredicateSql('r._hq_time', { lower: 'b._hq_scan_lower', upper: 'b._hq_scan_upper', lowerInclusive: 'b._hq_scan_lower_inclusive', upperInclusive: 'b._hq_scan_upper_inclusive' });
     return {
         ctes: [
             `${ranges} AS (SELECT _hq_period, ${lower} AS _hq_scan_lower, ${upper} AS _hq_scan_upper, ${lowerInclusive} AS _hq_scan_lower_inclusive, ${upperInclusive} AS _hq_scan_upper_inclusive FROM _hq_context${context})`,
-            `_hq_keys${id} AS (SELECT *, ${add(first, `arrayJoin(range(toUInt64(${count} + ${guard})))`, axis.grain)} AS _hq_source_period FROM ${ranges})`,
-            `${rows} AS (SELECT r.*, b._hq_period FROM _hq_source AS r INNER JOIN _hq_keys${id} AS b ON ${GRAIN_FUNCTIONS[axis.grain]}(r._hq_time) = b._hq_source_period WHERE ${predicate})`,
-            `${aggregate} AS (SELECT ${group}, toNullable(${expression}) AS ${value} FROM ${rows} GROUP BY ${group})`,
+            `_hq_keys${id} AS (SELECT *, ${dialect.addTime(first, dialect.seriesIndex(`${count} + ${guard}`), axis.grain)} AS _hq_source_period FROM ${ranges})`,
+            `${rows} AS (SELECT r.*, b._hq_period FROM _hq_source AS r INNER JOIN _hq_keys${id} AS b ON ${dialect.truncateTime('r._hq_time', axis.grain)} = b._hq_source_period WHERE ${predicate})`,
+            `${aggregate} AS (SELECT ${group}, ${dialect.toNullable(expression)} AS ${value} FROM ${rows} GROUP BY ${group})`,
         ],
         population: rows, aggregate, context, cumulative: false,
         guard: `(SELECT coalesce(max(${guard}), 0) FROM ${ranges})`, count: isCountAggregation(base.definition),

package/dist/utils/time-measure-result-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-result-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-result-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAIxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,sFAAsF;AACtF,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,IAAI,EAAE,SAAS,uBAAuB,EAAE,EACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,eAAe,EAAE,MAAM,EACvB,iBAAiB,UAAQ,GACxB,MAAM,CAuBR"}
+{"version":3,"file":"time-measure-result-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-result-sql.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAIxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAE5E,sFAAsF;AACtF,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,4BAA4B,EACrC,IAAI,EAAE,SAAS,uBAAuB,EAAE,EACxC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,eAAe,EAAE,MAAM,EACvB,iBAAiB,UAAQ,GACxB,MAAM,CAwBR"}

package/dist/utils/time-measure-result-sql.js

@@ -1,31 +1,30 @@
 import { semanticOrderDirection } from './semantic-query-syntax.js';
-import { quoteSQLIdentifier } from '../sql-utils.js';
+import { resolveDatasetSqlDialect } from './dataset-sql-dialect.js';
 import { getDerivedMeasure } from './dataset-measures.js';
 import { derivedProjection } from './derived-measure-sql.js';
 /** Evaluate formulas after aggregation, then apply output ordering and pagination. */
 export function buildTimeMeasureResultSql(ds, query, options, dims, ctes, validationGuard, formulasEvaluated = false) {
+    const dialect = resolveDatasetSqlDialect(options.builderFactory);
+    const quote = dialect.quoteIdentifier;
     const selected = query.measures ?? [];
     const projections = [
-        quoteSQLIdentifier('period'),
-        ...dims.map(dimension => quoteSQLIdentifier(dimension.name)),
+        quote('period'),
+        ...dims.map(dimension => quote(dimension.name)),
         ...selected.map(name => {
             const derived = getDerivedMeasure(ds.measures, name);
-            return derived && !formulasEvaluated ? derivedProjection(name, derived) : quoteSQLIdentifier(name);
+            return derived && !formulasEvaluated ? derivedProjection(dialect, name, derived) : quote(name);
         }),
     ];
     // Keep toSQL independently guarded too. This branch produces no valid
     // result rows, and forces axis validation even when _hq_values is empty.
     const outputNames = ['period', ...dims.map(dimension => dimension.name), ...selected];
-    const nullProjections = outputNames.map(name => `NULL AS ${quoteSQLIdentifier(name)}`).join(', ');
+    const nullProjections = outputNames.map(name => `NULL AS ${quote(name)}`).join(', ');
     const resultCte = `_hq_result AS (SELECT ${projections.join(', ')} FROM _hq_values`
         + ` UNION ALL SELECT ${nullProjections} FROM _hq_bounds WHERE ${validationGuard} = 1)`;
-    let sql = `WITH ${[...ctes, resultCte].join(',\n')} SELECT ${outputNames.map(quoteSQLIdentifier).join(', ')} FROM _hq_result`;
+    let sql = `WITH ${[...ctes, resultCte].join(',\n')} SELECT ${outputNames.map(name => quote(name)).join(', ')} FROM _hq_result`;
     const order = query.orderBy?.length ? query.orderBy : [{ field: 'period', direction: 'asc' }];
-    sql += ` ORDER BY ${order.map(item => `${quoteSQLIdentifier(item.field)} ${semanticOrderDirection(item.direction)}`).join(', ')}`;
+    sql += ` ORDER BY ${order.map(item => dialect.orderTerm(quote(item.field), semanticOrderDirection(item.direction))).join(', ')}`;
     const limit = options.executionLimit ?? query.limit;
-    if (limit !== undefined)
-        sql += ` LIMIT ${limit}`;
-    if (query.offset !== undefined)
-        sql += ` OFFSET ${query.offset}`;
+    sql += dialect.paginate(limit, query.offset);
     return sql;
 }

package/dist/utils/time-measure-source-sql.d.ts

@@ -1,5 +1,7 @@
 import type { AnyDatasetInstance, DatasetQuery, MeasureDefinition, MetricFilter } from '../types.js';
 import type { DatasetQueryExecutionOptions } from '../dataset-query.js';
+import type { StatementParameters } from './statement-parameters.js';
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
 export interface TimeMeasureSqlDimension {
     name: string;
     alias: string;
@@ -12,11 +14,12 @@ export interface TimeMeasureSqlBase {
 }
 export interface TimeMeasureSqlSource {
     ctes: string[];
-    parameters: unknown[];
     dimensions: TimeMeasureSqlDimension[];
     bases: TimeMeasureSqlBase[];
     rowAlias: string;
 }
+/** The query timezone carried by `_hq_source` time, read from a zero-row scalar without scanning. */
+export declare function sourceTimezoneSql(dialect: DatasetSqlDialectRules): string;
 /** Isolate authored expressions, joins, tenancy and filters from internal SQL aliases. */
-export declare function buildTimeMeasureSourceSql(ds: AnyDatasetInstance, query: DatasetQuery, baseNames: Iterable<string>, filters: readonly MetricFilter[], options: DatasetQueryExecutionOptions): TimeMeasureSqlSource;
+export declare function buildTimeMeasureSourceSql(ds: AnyDatasetInstance, query: DatasetQuery, baseNames: Iterable<string>, filters: readonly MetricFilter[], options: DatasetQueryExecutionOptions, statement: StatementParameters): TimeMeasureSqlSource;
 //# sourceMappingURL=time-measure-source-sql.d.ts.map

package/dist/utils/time-measure-source-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-source-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-source-sql.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAUxE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,OAAO,EAAE,CAAC;IACtB,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,0FAA0F;AAC1F,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,4BAA4B,GACpC,oBAAoB,CA6DtB"}
+{"version":3,"file":"time-measure-source-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-source-sql.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAQxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAExE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,iBAAiB,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,UAAU,EAAE,uBAAuB,EAAE,CAAC;IACtC,KAAK,EAAE,kBAAkB,EAAE,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qGAAqG;AACrG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,sBAAsB,GAAG,MAAM,CAEzE;AAED,0FAA0F;AAC1F,wBAAgB,yBAAyB,CACvC,EAAE,EAAE,kBAAkB,EACtB,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,EAC3B,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,OAAO,EAAE,4BAA4B,EACrC,SAAS,EAAE,mBAAmB,GAC7B,oBAAoB,CAoEtB"}

package/dist/utils/time-measure-source-sql.js

@@ -1,21 +1,28 @@
+import { scopedDatasetSource } from './scoped-dataset-source.js';
 import { resolveRelationshipMeasure } from './relationship-measures.js';
 import { relationshipMeasureExpressions } from './relationship-measure-sql.js';
-import { queryTimeSql } from './query-timezone.js';
-import { resolveDimensionExpression, resolveFilterField, resolveTenantFilterColumn } from '../query-planner.js';
-import { applyRelationshipJoins, buildRelationshipBuilderContext, qualifyBaseColumn } from './relationship-builder-plan.js';
-import { getRuntimeTenantPredicate } from './tenant-runtime.js';
+import { queryTimeFilter, queryTimeSql } from './query-timezone.js';
+import { resolveDimensionExpression, resolveFilterField } from '../query-planner.js';
+import { buildRelationshipBuilderContext } from './relationship-builder-plan.js';
 import { segmentFilters } from './segments.js';
 import { getBaseMeasure } from './dataset-measures.js';
 import { measureToAggregationSpec } from './dataset-normalization.js';
 import { applyFilteredAggregationExpression } from './filtered-aggregation-sql.js';
 import { assertNoRawSqlUnderJoins } from './sql-under-joins.js';
+/** The query timezone carried by `_hq_source` time, read from a zero-row scalar without scanning. */
+export function sourceTimezoneSql(dialect) {
+    return dialect.timezoneOf(dialect.assumeNotNull('(SELECT _hq_time FROM _hq_source LIMIT 0)'));
+}
 /** Isolate authored expressions, joins, tenancy and filters from internal SQL aliases. */
-export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options) {
+export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options, statement) {
+    const { dialect } = statement;
     const bases = [];
-    const joinCtx = buildRelationshipBuilderContext(ds, query, options.context);
+    const joinCtx = buildRelationshipBuilderContext(ds, query, options.context, dialect);
     // Keep source expressions in their own SELECT scope: internal aliases cannot
     // capture authored SQL identifiers, even if a physical column shares a name.
-    let raw = applyRelationshipJoins(options.builderFactory.table(ds.source), joinCtx);
+    let raw = scopedDatasetSource({
+        builderFactory: options.builderFactory, ds, context: options.context, joinCtx, dialect, timezone: query.timezone,
+    });
     const dims = (query.dimensions ?? []).map((name, i) => ({ name, alias: `_hq_d${i}` }));
     const sourceParts = [resolveDimensionExpression(ds, ds.timeKey, joinCtx)];
     for (const dimension of dims)
@@ -31,9 +38,9 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
         const value = `_hq_v${bases.length}`;
         const arg = `_hq_a${bases.length}`;
         bases.push({ name, definition, value, arg });
-        const expressions = related ? relationshipMeasureExpressions(ds, name, joinCtx) : undefined;
+        const expressions = related ? relationshipMeasureExpressions(ds, name, joinCtx, dialect) : undefined;
         const expression = expressions?.field ?? spec.sql ?? resolveDimensionExpression(ds, spec.field, joinCtx);
-        sourceParts.push(expressions ? expression : applyFilteredAggregationExpression(ds, spec, expression, joinCtx));
+        sourceParts.push(expressions ? expression : applyFilteredAggregationExpression(ds, spec, expression, joinCtx, dialect));
         sourceParts.push(expressions?.arg ?? (spec.argField ? resolveDimensionExpression(ds, spec.argField, joinCtx) : 'NULL'));
     }
     // A positional tuple isolates internal names from the source table's names.
@@ -47,31 +54,34 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
     let rowAlias = '_hq_row';
     while (sourceIdentifiers.some(text => text.includes(rowAlias)))
         rowAlias += '_';
-    raw = raw.select([`tuple(${sourceParts.join(', ')}) AS ${rowAlias}`]);
-    const tenant = getRuntimeTenantPredicate(options.context);
-    const tenantColumn = resolveTenantFilterColumn(ds, options.context);
-    if (tenant && tenantColumn)
-        raw = raw.where(qualifyBaseColumn(joinCtx, tenantColumn), tenant.operator, tenant.value);
+    raw = raw.select([`${dialect.packRow(sourceParts)} AS ${rowAlias}`]);
+    // The time axis already consumed every time-key bound, so these are the
+    // remaining caller filters.
     for (const filter of filters) {
-        raw = raw.where(resolveFilterField(ds, filter.field, joinCtx), filter.operator, filter.value);
+        const predicates = queryTimeFilter(dialect, ds, filter, resolveFilterField(ds, filter.field, joinCtx), query.timezone);
+        for (const predicate of predicates) {
+            raw = raw.where(predicate.expression, predicate.operator, predicate.value);
+        }
     }
     for (const filter of segmentFilters(ds, query.segments)) {
-        raw = raw.where(resolveDimensionExpression(ds, filter.field, joinCtx), filter.operator, filter.value);
+        const predicates = queryTimeFilter(dialect, ds, filter, resolveDimensionExpression(ds, filter.field, joinCtx), query.timezone, { field: 'dimension' });
+        for (const predicate of predicates) {
+            raw = raw.where(predicate.expression, predicate.operator, predicate.value);
+        }
     }
-    const { sql: rawSql, parameters } = raw.toSQLWithParams();
-    const sourceColumns = [`${queryTimeSql(`assumeNotNull(tupleElement(${rowAlias}, 1))`, query.timezone)} AS _hq_time`];
-    dims.forEach((dimension, i) => sourceColumns.push(`tupleElement(${rowAlias}, ${i + 2}) AS ${dimension.alias}`));
+    const rawSql = statement.embedBuilder(raw);
+    const sourceColumns = [`${queryTimeSql(dialect, dialect.assumeNotNull(dialect.rowElement(rowAlias, 1)), query.timezone)} AS _hq_time`];
+    dims.forEach((dimension, i) => sourceColumns.push(`${dialect.rowElement(rowAlias, i + 2)} AS ${dimension.alias}`));
     bases.forEach((base, i) => {
         const valuePosition = dims.length + 2 + i * 2;
-        sourceColumns.push(`tupleElement(${rowAlias}, ${valuePosition}) AS ${base.value}`);
-        sourceColumns.push(`tupleElement(${rowAlias}, ${valuePosition + 1}) AS ${base.arg}`);
+        sourceColumns.push(`${dialect.rowElement(rowAlias, valuePosition)} AS ${base.value}`);
+        sourceColumns.push(`${dialect.rowElement(rowAlias, valuePosition + 1)} AS ${base.arg}`);
     });
     return {
         ctes: [
             `_hq_raw AS (${rawSql})`,
-            `_hq_source AS (SELECT ${sourceColumns.join(', ')} FROM _hq_raw WHERE isNotNull(tupleElement(${rowAlias}, 1)))`,
+            `_hq_source AS (SELECT ${sourceColumns.join(', ')} FROM _hq_raw WHERE ${dialect.isNotNull(dialect.rowElement(rowAlias, 1))})`,
         ],
-        parameters,
         dimensions: dims,
         bases,
         rowAlias,

package/dist/utils/time-measure-values-sql.d.ts

@@ -1,3 +1,4 @@
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
 import type { TimeGrain, WindowMeasureDefinition } from '../types.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
 import type { TimeMeasureSqlBase, TimeMeasureSqlDimension } from './time-measure-source-sql.js';
@@ -12,9 +13,9 @@ export interface TimeMeasureSqlInput {
     /** Shift populations already map exclusively to the requested output series. */
     restrictToAxis?: boolean;
 }
-export declare function windowScanStartSql(window: WindowMeasureDefinition, grain: TimeGrain): string;
+export declare function windowScanStartSql(dialect: DatasetSqlDialectRules, window: WindowMeasureDefinition, grain: TimeGrain): string;
 /** Base measures respect partial endpoints; windows use entire contributing buckets. */
-export declare function windowMeasureRowsSql(window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis): string;
+export declare function windowMeasureRowsSql(dialect: DatasetSqlDialectRules, window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis): string;
 /** Fill dimension combinations, aggregate populations, and join measure values onto the series. */
-export declare function buildTimeMeasureValuesSql(dims: readonly TimeMeasureSqlDimension[], inputs: readonly TimeMeasureSqlInput[], axis: TimeMeasureAxis): string[];
+export declare function buildTimeMeasureValuesSql(dialect: DatasetSqlDialectRules, dims: readonly TimeMeasureSqlDimension[], inputs: readonly TimeMeasureSqlInput[], axis: TimeMeasureAxis): string[];
 //# sourceMappingURL=time-measure-values-sql.d.ts.map

package/dist/utils/time-measure-values-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"time-measure-values-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-values-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAGtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKhG,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,CAAC,EAAE,uBAAuB,CAAC;IACjC,+DAA+D;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gFAAgF;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAwBD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAI5F;AAED,wFAAwF;AACxF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,CAG/G;AAED,mGAAmG;AACnG,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,SAAS,uBAAuB,EAAE,EACxC,MAAM,EAAE,SAAS,mBAAmB,EAAE,EACtC,IAAI,EAAE,eAAe,GACpB,MAAM,EAAE,CA0CV"}
+{"version":3,"file":"time-measure-values-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-values-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAIhG,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,kBAAkB,CAAC;IACzB,MAAM,CAAC,EAAE,uBAAuB,CAAC;IACjC,+DAA+D;IAC/D,OAAO,EAAE,MAAM,CAAC;IAChB,2DAA2D;IAC3D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,gFAAgF;IAChF,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAwBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,uBAAuB,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAI7H;AAED,wFAAwF;AACxF,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,uBAAuB,GAAG,SAAS,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM,CAGhJ;AAED,mGAAmG;AACnG,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,sBAAsB,EAC/B,IAAI,EAAE,SAAS,uBAAuB,EAAE,EACxC,MAAM,EAAE,SAAS,mBAAmB,EAAE,EACtC,IAAI,EAAE,eAAe,GACpB,MAAM,EAAE,CA0CV"}