@hypequery/datasets 0.24.0 → 0.26.0

package/dist/utils/row-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"row-scope.d.ts","sourceRoot":"","sources":["../../src/utils/row-scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACb,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtF,sEAAsE;AACtE,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAE9E;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,EAAE,EAAE,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,EACzC,OAAO,CAAC,EAAE,gBAAgB,GACzB,iBAAiB,EAAE,CAGrB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,YAAY,EAAE,CAEtF;AAED,oFAAoF;AACpF,wBAAgB,aAAa,CAC3B,EAAE,EAAE,gBAAgB,EACpB,KAAK,EAAE,SAAS,iBAAiB,EAAE,EACnC,OAAO,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAyB,GACrD,gBAAgB,CAKlB"}

package/dist/utils/row-scope.js

@@ -0,0 +1,26 @@
+import { getRuntimeTenantPredicate } from './tenant-runtime.js';
+/**
+ * The trusted predicates restricting which source rows of `ds` any query may
+ * read (RFC 0020). They apply to the queried dataset and to every joined
+ * relationship target alike. `tenantKey` with a runtime tenant lowers to one
+ * predicate; the trusted cross-tenant scope (`scope: 'all'`) lowers to none.
+ */
+export function datasetRowScope(ds, context) {
+    const tenant = getRuntimeTenantPredicate(context);
+    return tenant && ds.tenantKey ? [{ column: ds.tenantKey, ...tenant }] : [];
+}
+/**
+ * The call's RFC 0019 enforced constraints, from trusted context only. They
+ * apply to the queried dataset, in its filter vocabulary, never to joined
+ * targets.
+ */
+export function runtimeConstraints(context) {
+    return context?.runtime?.constraints ?? [];
+}
+/** ANDs each row-scope predicate onto `qb`, with columns qualified by `qualify`. */
+export function applyRowScope(qb, scope, qualify = column => column) {
+    for (const predicate of scope) {
+        qb = qb.where(qualify(predicate.column), predicate.operator, predicate.value);
+    }
+    return qb;
+}

package/dist/utils/scoped-dataset-source.d.ts

@@ -0,0 +1,23 @@
+import type { AnyDatasetInstance, ExecutionContext } from '../types.js';
+import type { QueryBuilderFactoryLike, QueryBuilderLike } from '../query-builder-protocol.js';
+import type { DatasetSqlDialectRules } from '../dataset-sql-dialect.js';
+import { type RelationshipBuilderContext } from './relationship-builder-plan.js';
+export interface ScopedDatasetSourceOptions {
+    builderFactory: Pick<QueryBuilderFactoryLike, 'table'>;
+    ds: AnyDatasetInstance;
+    context?: ExecutionContext;
+    joinCtx: RelationshipBuilderContext | undefined;
+    dialect: DatasetSqlDialectRules;
+    timezone: string | undefined;
+}
+/**
+ * The dataset's source as a builder with every trusted row restriction
+ * applied (RFC 0020): `FINAL`, relationship joins scoped by each target's own
+ * row scope, the dataset's row scope, and the call's enforced constraints.
+ *
+ * Every builder-path query shape reads its source through here, so none can
+ * read rows the context does not allow. Callers add their own selections,
+ * filters and aggregations on top; every predicate here is ANDed with them.
+ */
+export declare function scopedDatasetSource(options: ScopedDatasetSourceOptions): QueryBuilderLike;
+//# sourceMappingURL=scoped-dataset-source.d.ts.map

package/dist/utils/scoped-dataset-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scoped-dataset-source.d.ts","sourceRoot":"","sources":["../../src/utils/scoped-dataset-source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,KAAK,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAIxE,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,gCAAgC,CAAC;AAIxC,MAAM,WAAW,0BAA0B;IACzC,cAAc,EAAE,IAAI,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;IACvD,EAAE,EAAE,kBAAkB,CAAC;IACvB,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,0BAA0B,GAAG,SAAS,CAAC;IAChD,OAAO,EAAE,sBAAsB,CAAC;IAChC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,0BAA0B,GAAG,gBAAgB,CAiBzF"}

package/dist/utils/scoped-dataset-source.js

@@ -0,0 +1,34 @@
+import { resolveFilterField } from '../query-planner.js';
+import { FINAL_SAFETY_SETTINGS, datasetSourceBuilder, queryReadsFinal } from './dataset-source.js';
+import { queryTimeFilter } from './query-timezone.js';
+import { applyRelationshipJoins, qualifyBaseColumn, } from './relationship-builder-plan.js';
+import { assertEnforcedConstraints } from './enforced-constraints.js';
+import { applyRowScope, datasetRowScope, runtimeConstraints } from './row-scope.js';
+/**
+ * The dataset's source as a builder with every trusted row restriction
+ * applied (RFC 0020): `FINAL`, relationship joins scoped by each target's own
+ * row scope, the dataset's row scope, and the call's enforced constraints.
+ *
+ * Every builder-path query shape reads its source through here, so none can
+ * read rows the context does not allow. Callers add their own selections,
+ * filters and aggregations on top; every predicate here is ANDed with them.
+ */
+export function scopedDatasetSource(options) {
+    const { ds, context, joinCtx, dialect, timezone } = options;
+    // Validators report this too; checked here so no path can skip it.
+    assertEnforcedConstraints(ds, context);
+    let qb = applyRelationshipJoins(datasetSourceBuilder(options.builderFactory, ds), joinCtx);
+    // A resolved join target is read with FINAL even when this dataset isn't.
+    if (queryReadsFinal(ds, joinCtx) && qb.settings)
+        qb = qb.settings(FINAL_SAFETY_SETTINGS);
+    qb = applyRowScope(qb, datasetRowScope(ds, context), column => qualifyBaseColumn(joinCtx, column));
+    // Constraints are filters in the dataset's vocabulary, applied exactly as a
+    // caller filter on the same field would be.
+    for (const constraint of runtimeConstraints(context)) {
+        const expression = resolveFilterField(ds, constraint.field, joinCtx);
+        for (const predicate of queryTimeFilter(dialect, ds, constraint, expression, timezone)) {
+            qb = qb.where(predicate.expression, predicate.operator, predicate.value);
+        }
+    }
+    return qb;
+}

package/dist/utils/snapshot-execution-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot-execution-context.d.ts","sourceRoot":"","sources":["../../src/utils/snapshot-execution-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,SAAS,CAajG"}
+{"version":3,"file":"snapshot-execution-context.d.ts","sourceRoot":"","sources":["../../src/utils/snapshot-execution-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,kFAAkF;AAClF,wBAAgB,wBAAwB,CAAC,OAAO,CAAC,EAAE,gBAAgB,GAAG,gBAAgB,GAAG,SAAS,CAgBjG"}

package/dist/utils/snapshot-execution-context.js

@@ -9,6 +9,9 @@ export function snapshotExecutionContext(context) {
                 ...context.runtime,
                 // Copy tenant objects and ID lists; retain adapter and AbortSignal identity.
                 tenant: structuredClone(context.runtime.tenant),
+                ...(context.runtime.constraints === undefined
+                    ? {}
+                    : { constraints: structuredClone(context.runtime.constraints) }),
             },
         }),
         ...(context.cache && { cache: { ...context.cache } }),

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

@@ -1,6 +1,6 @@
 import type { StatementParameters } from './statement-parameters.js';
 import type { TimeMeasureAxis } from './time-measure-axis.js';
-import type { TimeMeasureSqlSource } from './time-measure-source-sql.js';
+import { type TimeMeasureSqlSource } from './time-measure-source-sql.js';
 import type { ShiftMeasureDefinition } from '../types.js';
 export interface TimeMeasureSqlAxis {
     ctes: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"time-measure-axis-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,6DAA6D;AAC7D,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,eAAe,EACrB,MAAM,GAAE,SAAS,sBAAsB,EAAO,GAC7C,kBAAkB,CA2CpB"}
+{"version":3,"file":"time-measure-axis-sql.d.ts","sourceRoot":"","sources":["../../src/utils/time-measure-axis-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAqB,KAAK,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAE5F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG1D,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,6DAA6D;AAC7D,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,eAAe,EACrB,MAAM,GAAE,SAAS,sBAAsB,EAAO,GAC7C,kBAAkB,CA2CpB"}

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

@@ -1,3 +1,4 @@
+import { sourceTimezoneSql } from './time-measure-source-sql.js';
 import { calendarBucketGuardSql } from './time-axis-calendar-guard.js';
 import { shiftCalendarGuardSql, shiftWallTimeSeriesGuardSql } from './shift-measure-sql.js';
 /** Build bounded output buckets using the query timezone. */
@@ -24,7 +25,7 @@ export function buildTimeMeasureAxisSql(statement, source, axis, shifts = []) {
     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 = dialect.timezoneOf(dialect.assumeNotNull('(SELECT _hq_time FROM _hq_source LIMIT 0)'));
+    const timezone = sourceTimezoneSql(dialect);
     const bounds = [
         // 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`,

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

@@ -1,7 +1,7 @@
 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(dialect: DatasetSqlDialectRules, id: number, context: number, base: TimeMeasureSqlBase, window: WindowMeasureDefinition | undefined, axis: TimeMeasureAxis, dims: readonly TimeMeasureSqlDimension[]): {
     ctes: 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":"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,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKhG,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;;;;;;;;EA8CtO"}
+{"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,3 +1,4 @@
+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 } from './count-aggregations.js';
@@ -27,7 +28,8 @@ export function timeMeasureLeafSql(dialect, id, context, base, window, axis, dim
         };
     }
     const lower = window?.trailing ? dialect.subtractTime('_hq_eval_end', window.trailing.amount, window.trailing.unit)
-        : window?.toDate ? dialect.truncateTime('_hq_eval_period', window.toDate) : '_hq_eval_lower';
+        // 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';

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

@@ -1,6 +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;
@@ -17,6 +18,8 @@ export interface TimeMeasureSqlSource {
     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, 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":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AASxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,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,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,CAqEtB"}
+{"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,15 +1,18 @@
-import { datasetSourceBuilder } from './dataset-source.js';
+import { scopedDatasetSource } from './scoped-dataset-source.js';
 import { resolveRelationshipMeasure } from './relationship-measures.js';
 import { relationshipMeasureExpressions } from './relationship-measure-sql.js';
 import { queryTimeFilter, 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 { 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, statement) {
     const { dialect } = statement;
@@ -17,7 +20,9 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
     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(datasetSourceBuilder(options.builderFactory, ds), 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)
@@ -50,10 +55,6 @@ export function buildTimeMeasureSourceSql(ds, query, baseNames, filters, options
     while (sourceIdentifiers.some(text => text.includes(rowAlias)))
         rowAlias += '_';
     raw = raw.select([`${dialect.packRow(sourceParts)} 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);
     // The time axis already consumed every time-key bound, so these are the
     // remaining caller filters.
     for (const filter of filters) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hypequery/datasets",
-  "version": "0.24.0",
+  "version": "0.26.0",
   "description": "Code-first TypeScript semantic layer for ClickHouse datasets, metrics, multi-tenancy, and AI agents",
   "keywords": [
     "semantic-layer",
@@ -55,7 +55,7 @@
     "!dist/**/type-tests/**"
   ],
   "dependencies": {
-    "@hypequery/protocol": "^0.21.0",
+    "@hypequery/protocol": "^0.23.0",
     "@noble/hashes": "^2.4.0",
     "zod": "^4.6.6",
     "zod-to-json-schema": "^3.25.2"
@@ -73,7 +73,7 @@
     "typescript": "^6.0.3",
     "@vitest/coverage-v8": "^5.0.5",
     "vitest": "^5.0.5",
-    "@hypequery/protocol-conformance": "^0.16.0"
+    "@hypequery/protocol-conformance": "^0.16.2"
   },
   "repository": {
     "type": "git",