@holistics/cli-core 2.5.6 → 2.5.7

package/dist/commands.js

@@ -24022,7 +24022,7 @@ var require_dist4 = __commonJS((exports2) => {
   exports2.default = deferred;
 });
 // package.json
-var version = "2.5.6";
+var version = "2.5.7";
 
 // ../../node_modules/.pnpm/commander@15.0.0/node_modules/commander/lib/error.js
 class CommanderError extends Error {
@@ -105272,7 +105272,7 @@ var TypeClass = /* @__PURE__ */ function(e9) {
   return e9.SCALAR = "scalar", e9.FIELD = "field", e9.ROW = "row", e9.TABLE = "table", e9.RELATIONSHIP = "relationship", e9.ARRAY = "array", e9.GROUPING_SET = "grouping_set", e9.FUNCTION = "function", e9.UNION = "union", e9.TYPE_PARAMETER = "type_parameter", e9.TYPE_CLASS = "type_class", e9.USER_ATTRIBUTE = "user_attribute", e9.MODULE = "module", e9.ERROR_ANY = "error_any", e9.NULL = "null", e9;
 }({});
 var ErrorCode = /* @__PURE__ */ function(e9) {
-  return e9[e9.UNEXPECTED_ERROR = 0] = "UNEXPECTED_ERROR", e9[e9.SYNTAX_ERROR = 1] = "SYNTAX_ERROR", e9[e9.INVALID_EXPRESSION_0 = 100] = "INVALID_EXPRESSION_0", e9[e9.RELATIONSHIP_NOT_FOUND_0 = 101] = "RELATIONSHIP_NOT_FOUND_0", e9[e9.MODEL_0_NOT_FOUND = 102] = "MODEL_0_NOT_FOUND", e9[e9.FIELD_0_NOT_FOUND_IN_MODEL_1 = 103] = "FIELD_0_NOT_FOUND_IN_MODEL_1", e9[e9.FANOUT_ON_0_FROM_1 = 104] = "FANOUT_ON_0_FROM_1", e9[e9.MODEL_IN_AQL_FIELD_NOT_FOUND = 105] = "MODEL_IN_AQL_FIELD_NOT_FOUND", e9[e9.RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1 = 106] = "RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1", e9[e9.INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2 = 200] = "INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2", e9[e9.INVALID_ARGUMENT_TYPE = 201] = "INVALID_ARGUMENT_TYPE", e9[e9.UNKNOWN_IDENTIFIER_0 = 202] = "UNKNOWN_IDENTIFIER_0", e9[e9.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1 = 203] = "UNSUPPORTED_OPERATOR_0_FOR_TYPE_1", e9[e9.EXPECTED_0_FOUND_1 = 204] = "EXPECTED_0_FOUND_1", e9[e9.NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0 = 205] = "NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0", e9[e9.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0 = 206] = "EXPECTED_SCALAR_LIKE_TYPE_FOUND_0", e9[e9.NO_MATCHING_SIGNATURE_FOR_FUNCTION_0 = 207] = "NO_MATCHING_SIGNATURE_FOR_FUNCTION_0", e9[e9.INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1 = 208] = "INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1", e9[e9.DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0 = 209] = "DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0", e9[e9.CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL = 210] = "CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL", e9[e9.RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION = 211] = "RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION", e9[e9.INVALID_METRIC_DEFINITION_0_IN_DATASET_1 = 212] = "INVALID_METRIC_DEFINITION_0_IN_DATASET_1", e9[e9.MEMBER_0_NOT_FOUND_IN_MODULE_1 = 213] = "MEMBER_0_NOT_FOUND_IN_MODULE_1", e9[e9.INVALID_BIZ_CAL_FUNCTION_0 = 214] = "INVALID_BIZ_CAL_FUNCTION_0", e9[e9.USER_ATTRIBUTE_0_NOT_FOUND = 215] = "USER_ATTRIBUTE_0_NOT_FOUND", e9[e9.INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES = 216] = "INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES", e9[e9.TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS = 217] = "TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS", e9[e9.INVALID_ROW_LEVEL_PERMISSION = 218] = "INVALID_ROW_LEVEL_PERMISSION", e9[e9.PERMISSION_RULE_VIOLATION_ERROR = 219] = "PERMISSION_RULE_VIOLATION_ERROR", e9[e9.UNSUPPORTED_BEHAVIOR_0 = 220] = "UNSUPPORTED_BEHAVIOR_0", e9[e9.POTENTIAL_DB_RUNTIME_ERROR_0 = 221] = "POTENTIAL_DB_RUNTIME_ERROR_0", e9[e9.AMBIGUOUS_RELATIONSHIP_0 = 222] = "AMBIGUOUS_RELATIONSHIP_0", e9[e9.QUERY_PARAM_UNSUPPORTED_OPERATOR = 223] = "QUERY_PARAM_UNSUPPORTED_OPERATOR", e9[e9.QUERY_PARAM_INVALID_PARAM_INPUT = 224] = "QUERY_PARAM_INVALID_PARAM_INPUT", e9[e9.ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0 = 225] = "ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0", e9[e9.ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS = 226] = "ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS", e9[e9.CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0 = 227] = "CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0", e9[e9.INVALID_FIELD_DECLARATION = 228] = "INVALID_FIELD_DECLARATION", e9[e9.CANNOT_REDECLARE_FIELD = 229] = "CANNOT_REDECLARE_FIELD", e9[e9.ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE = 230] = "ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE", e9[e9.CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0 = 231] = "CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0", e9[e9.INVALID_WINDOW_FRAME_0 = 232] = "INVALID_WINDOW_FRAME_0", e9[e9.CYLIC_FIELD_DEPENDENCY_DETECTED_0 = 233] = "CYLIC_FIELD_DEPENDENCY_DETECTED_0", e9[e9.INVALID_SHORTHAND_AGGREGATION_0 = 234] = "INVALID_SHORTHAND_AGGREGATION_0", e9[e9.UNSUPPORTED_DATE_UNIT_0 = 235] = "UNSUPPORTED_DATE_UNIT_0", e9[e9.INVALID_CONDITIONAL_EXPRESSION_IN_0 = 236] = "INVALID_CONDITIONAL_EXPRESSION_IN_0", e9[e9.UNKNOWN_FUNCTION_0 = 237] = "UNKNOWN_FUNCTION_0", e9[e9.CANNOT_MATCH_ROW_WITH_TABLE_0 = 238] = "CANNOT_MATCH_ROW_WITH_TABLE_0", e9[e9.DUPLICATE_FIELD_NAME_0 = 239] = "DUPLICATE_FIELD_NAME_0", e9[e9.FUNCTION_0_EXPECT_1_GOT_2 = 240] = "FUNCTION_0_EXPECT_1_GOT_2", e9[e9.NESTED_WINDOW_FUNCTION = 241] = "NESTED_WINDOW_FUNCTION", e9[e9.FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS = 242] = "FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS", e9[e9.REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED = 243] = "REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED", e9[e9.INVALID_TABLE_CONDITION_0 = 244] = "INVALID_TABLE_CONDITION_0", e9[e9.INVALID_DATETIME_LITERAL_0 = 245] = "INVALID_DATETIME_LITERAL_0", e9[e9.NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1 = 246] = "NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1", e9[e9.RECURSIVE_AQL_FUNCTION_0_CHAIN_1 = 247] = "RECURSIVE_AQL_FUNCTION_0_CHAIN_1", e9[e9.INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2 = 248] = "INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2", e9[e9.INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2 = 249] = "INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2", e9[e9.AQL_0_1_SHADOWS_BUILTIN = 250] = "AQL_0_1_SHADOWS_BUILTIN", e9[e9.RELATIONSHIP_FILTER_ON_0_READS_1 = 251] = "RELATIONSHIP_FILTER_ON_0_READS_1", e9[e9.RELATIONSHIP_MATCH_READS_0 = 252] = "RELATIONSHIP_MATCH_READS_0", e9[e9.RELATIONSHIP_MATCH_MISSES_0 = 253] = "RELATIONSHIP_MATCH_MISSES_0", e9[e9.AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3 = 254] = "AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3", e9[e9.OPERATOR_0_ON_PARAM_1 = 255] = "OPERATOR_0_ON_PARAM_1", e9[e9.SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER = 300] = "SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER", e9;
+  return e9[e9.UNEXPECTED_ERROR = 0] = "UNEXPECTED_ERROR", e9[e9.SYNTAX_ERROR = 1] = "SYNTAX_ERROR", e9[e9.INVALID_EXPRESSION_0 = 100] = "INVALID_EXPRESSION_0", e9[e9.RELATIONSHIP_NOT_FOUND_0 = 101] = "RELATIONSHIP_NOT_FOUND_0", e9[e9.MODEL_0_NOT_FOUND = 102] = "MODEL_0_NOT_FOUND", e9[e9.FIELD_0_NOT_FOUND_IN_MODEL_1 = 103] = "FIELD_0_NOT_FOUND_IN_MODEL_1", e9[e9.FANOUT_ON_0_FROM_1 = 104] = "FANOUT_ON_0_FROM_1", e9[e9.MODEL_IN_AQL_FIELD_NOT_FOUND = 105] = "MODEL_IN_AQL_FIELD_NOT_FOUND", e9[e9.RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1 = 106] = "RELATIONSHIP_PATH_NOT_FOUND_FROM_0_TO_1", e9[e9.INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2 = 200] = "INVALID_ARITY_EXPECT_0_FOR_FUNCTION_1_GOT_2", e9[e9.INVALID_ARGUMENT_TYPE = 201] = "INVALID_ARGUMENT_TYPE", e9[e9.UNKNOWN_IDENTIFIER_0 = 202] = "UNKNOWN_IDENTIFIER_0", e9[e9.UNSUPPORTED_OPERATOR_0_FOR_TYPE_1 = 203] = "UNSUPPORTED_OPERATOR_0_FOR_TYPE_1", e9[e9.EXPECTED_0_FOUND_1 = 204] = "EXPECTED_0_FOUND_1", e9[e9.NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0 = 205] = "NAMED_EXPRESSION_EXPECT_A_FIELD_OR_SCALAR_VALUE_FOUND_0", e9[e9.EXPECTED_SCALAR_LIKE_TYPE_FOUND_0 = 206] = "EXPECTED_SCALAR_LIKE_TYPE_FOUND_0", e9[e9.NO_MATCHING_SIGNATURE_FOR_FUNCTION_0 = 207] = "NO_MATCHING_SIGNATURE_FOR_FUNCTION_0", e9[e9.INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1 = 208] = "INVALID_MEASURE_DEFINITION_FOR_FIELD_0_IN_MODEL_1", e9[e9.DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0 = 209] = "DIMENSIONALIZE_NOT_ALLOWED_DUE_TO_0", e9[e9.CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL = 210] = "CANNOT_REFERENCE_AQL_FIELD_0_FROM_SQL", e9[e9.RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION = 211] = "RIGHT_SIDE_OF_PIPE_MUST_BE_A_FUNCTION", e9[e9.INVALID_METRIC_DEFINITION_0_IN_DATASET_1 = 212] = "INVALID_METRIC_DEFINITION_0_IN_DATASET_1", e9[e9.MEMBER_0_NOT_FOUND_IN_MODULE_1 = 213] = "MEMBER_0_NOT_FOUND_IN_MODULE_1", e9[e9.INVALID_BIZ_CAL_FUNCTION_0 = 214] = "INVALID_BIZ_CAL_FUNCTION_0", e9[e9.USER_ATTRIBUTE_0_NOT_FOUND = 215] = "USER_ATTRIBUTE_0_NOT_FOUND", e9[e9.INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES = 216] = "INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES", e9[e9.TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS = 217] = "TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS", e9[e9.INVALID_ROW_LEVEL_PERMISSION = 218] = "INVALID_ROW_LEVEL_PERMISSION", e9[e9.PERMISSION_RULE_VIOLATION_ERROR = 219] = "PERMISSION_RULE_VIOLATION_ERROR", e9[e9.UNSUPPORTED_BEHAVIOR_0 = 220] = "UNSUPPORTED_BEHAVIOR_0", e9[e9.POTENTIAL_DB_RUNTIME_ERROR_0 = 221] = "POTENTIAL_DB_RUNTIME_ERROR_0", e9[e9.AMBIGUOUS_RELATIONSHIP_0 = 222] = "AMBIGUOUS_RELATIONSHIP_0", e9[e9.QUERY_PARAM_UNSUPPORTED_OPERATOR = 223] = "QUERY_PARAM_UNSUPPORTED_OPERATOR", e9[e9.QUERY_PARAM_INVALID_PARAM_INPUT = 224] = "QUERY_PARAM_INVALID_PARAM_INPUT", e9[e9.ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0 = 225] = "ROW_MUST_CONTAIN_DIMENSIONS_ONLY_0", e9[e9.ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS = 226] = "ROW_COLUMNS_MUST_BE_SUBSET_OF_TABLE_COLUMNS", e9[e9.CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0 = 227] = "CANNOT_MATCH_ROW_WITH_LITERAL_TABLE_0", e9[e9.INVALID_FIELD_DECLARATION = 228] = "INVALID_FIELD_DECLARATION", e9[e9.CANNOT_REDECLARE_FIELD = 229] = "CANNOT_REDECLARE_FIELD", e9[e9.ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE = 230] = "ADHOC_FIELD_UNSUPPORTED_FIELD_TYPE", e9[e9.CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0 = 231] = "CANNOT_RUN_WINDOW_FUNCTION_IN_THIS_CONTEXT_0", e9[e9.INVALID_WINDOW_FRAME_0 = 232] = "INVALID_WINDOW_FRAME_0", e9[e9.CYLIC_FIELD_DEPENDENCY_DETECTED_0 = 233] = "CYLIC_FIELD_DEPENDENCY_DETECTED_0", e9[e9.INVALID_SHORTHAND_AGGREGATION_0 = 234] = "INVALID_SHORTHAND_AGGREGATION_0", e9[e9.UNSUPPORTED_DATE_UNIT_0 = 235] = "UNSUPPORTED_DATE_UNIT_0", e9[e9.INVALID_CONDITIONAL_EXPRESSION_IN_0 = 236] = "INVALID_CONDITIONAL_EXPRESSION_IN_0", e9[e9.UNKNOWN_FUNCTION_0 = 237] = "UNKNOWN_FUNCTION_0", e9[e9.CANNOT_MATCH_ROW_WITH_TABLE_0 = 238] = "CANNOT_MATCH_ROW_WITH_TABLE_0", e9[e9.DUPLICATE_FIELD_NAME_0 = 239] = "DUPLICATE_FIELD_NAME_0", e9[e9.FUNCTION_0_EXPECT_1_GOT_2 = 240] = "FUNCTION_0_EXPECT_1_GOT_2", e9[e9.NESTED_WINDOW_FUNCTION = 241] = "NESTED_WINDOW_FUNCTION", e9[e9.FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS = 242] = "FIELD_0_NOT_FOUND_IN_SELECTED_FIELDS", e9[e9.REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED = 243] = "REFERENCE_FIELD_0_NOT_GROUP_NOR_AGGREGATED", e9[e9.INVALID_TABLE_CONDITION_0 = 244] = "INVALID_TABLE_CONDITION_0", e9[e9.INVALID_DATETIME_LITERAL_0 = 245] = "INVALID_DATETIME_LITERAL_0", e9[e9.NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1 = 246] = "NO_PRIMARY_KEY_FOUND_FOR_MODEL_0_REASON_1", e9[e9.RECURSIVE_AQL_FUNCTION_0_CHAIN_1 = 247] = "RECURSIVE_AQL_FUNCTION_0_CHAIN_1", e9[e9.INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2 = 248] = "INVALID_RETURN_TYPE_FOR_FUNCTION_0_EXPECTED_1_GOT_2", e9[e9.INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2 = 249] = "INVALID_REF_ARGUMENT_FOR_PARAM_0_EXPECTED_1_GOT_2", e9[e9.AQL_0_1_SHADOWS_BUILTIN = 250] = "AQL_0_1_SHADOWS_BUILTIN", e9[e9.RELATIONSHIP_FILTER_ON_0_READS_1 = 251] = "RELATIONSHIP_FILTER_ON_0_READS_1", e9[e9.RELATIONSHIP_MATCH_READS_0 = 252] = "RELATIONSHIP_MATCH_READS_0", e9[e9.RELATIONSHIP_MATCH_MISSES_0 = 253] = "RELATIONSHIP_MATCH_MISSES_0", e9[e9.AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3 = 254] = "AQL_NAME_0_DECLARED_AS_1_AND_2_IN_3", e9[e9.OPERATOR_0_ON_PARAM_1 = 255] = "OPERATOR_0_ON_PARAM_1", e9[e9.SQL_PASSTHROUGH_FUNCTION_0_NOT_ALLOWED = 256] = "SQL_PASSTHROUGH_FUNCTION_0_NOT_ALLOWED", e9[e9.SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER = 300] = "SHOULD_FOLLOW_GROUP_WITH_SELECT_OR_FILTER", e9;
 }({});
 var isFieldTrace = (e9) => e9.type !== "udf";
 var isUdfTrace = (e9) => e9.type === "udf";
@@ -108074,6 +108074,7 @@ var errorMessages = {
   [ErrorCode.MEMBER_0_NOT_FOUND_IN_MODULE_1]: "Member `{0}` not found in module `{1}`.",
   [ErrorCode.INVALID_BIZ_CAL_FUNCTION_0]: "The function `{0}` is not part of the business calculation language. Please check the documentation for the list of supported functions. If you're trying to use a function from the AQL language, please convert this business calculation to an AQL field.",
   [ErrorCode.USER_ATTRIBUTE_0_NOT_FOUND]: "User attribute `{0}` not found.",
+  [ErrorCode.SQL_PASSTHROUGH_FUNCTION_0_NOT_ALLOWED]: "SQL passthrough function `{0}` is not allowed in ad-hoc fields. Define the field in the dataset or model instead.",
   [ErrorCode.INVALID_USAGE_OF_USER_ATTRIBUTE_0_MUTIPLE_VALUES]: "Invalid usage of user attribute `{0}`. User attribute contains mutiple values and cannot be used in this context.",
   [ErrorCode.TABLE_LITERAL_ROWS_MUST_HAVE_SAME_NUMBER_OF_COLUMNS]: "Table literal rows must have the same number of columns.",
   [ErrorCode.INVALID_ROW_LEVEL_PERMISSION]: "Invalid row level permission.",
@@ -108177,6 +108178,9 @@ function cylicFieldDependencyError(e9, t) {
   let n = e9.map((e10) => e10.join(" -> ")).join("; ");
   return createError(ErrorCode.CYLIC_FIELD_DEPENDENCY_DETECTED_0, t, n);
 }
+function shorthandAggregationOverConstMessage(e9, t) {
+  return `\`${t}\` is a const, so ${e9}(${t}) cannot infer the table to aggregate over. Aggregate the expression itself, e.g. ${e9}(<expression>), or bind a table to the const.`;
+}
 function shorthandAggregationWithMultipleModelsMessage(e9, t) {
   return `When there are multiple models involved, the table must be explicitly stated to avoid ambiguity. Valid form of the expression: ${e9}(<table>, ${t.loc?.source ? `${t.loc?.source}` : "<field expression>"}) . Please add the table to the query and try again.
 Correct usages:
@@ -121047,6 +121051,75 @@ function _createTypeChecker(e10, t, n, r3, i = CheckFlags.Normal) {
   }
 }
 var createTypeChecker = Rr3.wrapFuncWithinActiveSpan(_createTypeChecker);
+var NUMBER_AGGS = [
+  "sum",
+  "avg",
+  "average",
+  "median",
+  "stdev",
+  "stdevp",
+  "var",
+  "varp"
+];
+var MINMAX_AGGS = ["min", "max"];
+var COUNT_AGGS = [
+  "count",
+  "count_distinct",
+  "countd",
+  "approx_count_distinct",
+  "approx_countd"
+];
+var FAN_INVARIANT_AGGS = /* @__PURE__ */ new Set([
+  ...MINMAX_AGGS,
+  "count_distinct",
+  "countd",
+  "approx_count_distinct",
+  "approx_countd"
+]);
+function isFanInvariantAgg(e10) {
+  return FAN_INVARIANT_AGGS.has(e10);
+}
+var SHORTHAND_TABLE_AGGS = /* @__PURE__ */ new Set([
+  ...NUMBER_AGGS,
+  ...MINMAX_AGGS,
+  ...COUNT_AGGS,
+  "count_if"
+]);
+var AGG_PASSTHROUGH_FUNCS = /* @__PURE__ */ new Set([
+  "agg_text",
+  "agg_number",
+  "agg_truefalse",
+  "agg_datetime",
+  "agg_date"
+]);
+function isAggPassthrough(e10) {
+  return AGG_PASSTHROUGH_FUNCS.has(e10);
+}
+var SQL_PASSTHROUGH_FUNCS = /* @__PURE__ */ new Set([
+  "sql_text",
+  "sql_number",
+  "sql_truefalse",
+  "sql_datetime",
+  "sql_date"
+]);
+function invalidPassthroughFuncName(e10) {
+  if (!/^[a-zA-Z0-9_.]+$/.test(e10))
+    return `Invalid function name "${e10}". Function names must contain only alphanumeric characters, underscores, and dots`;
+}
+function isSqlPassthroughFunction(e10) {
+  return SQL_PASSTHROUGH_FUNCS.has(e10) || AGG_PASSTHROUGH_FUNCS.has(e10);
+}
+function checkAdhocSqlPassthrough(e10) {
+  let t = [];
+  return e10.forEach((e11) => {
+    visitAst((e12) => {
+      if (!isFunctionCall(e12) || e12.name.length !== 1)
+        return true;
+      let [n] = e12.name;
+      return isSqlPassthroughFunction(n.value) && t.push(createError(ErrorCode.SQL_PASSTHROUGH_FUNCTION_0_NOT_ALLOWED, n.loc, undefined, n.value)), true;
+    }, e11);
+  }), t;
+}
 function createFunctionType(e10, t, n, r3 = false, i = false) {
   return {
     typeClass: TypeClass.FUNCTION,
@@ -121906,61 +121979,6 @@ registerTypeRule([
     origin: undefined
   } : datetimeType;
 });
-var NUMBER_AGGS = [
-  "sum",
-  "avg",
-  "average",
-  "median",
-  "stdev",
-  "stdevp",
-  "var",
-  "varp"
-];
-var MINMAX_AGGS = ["min", "max"];
-var COUNT_AGGS = [
-  "count",
-  "count_distinct",
-  "countd",
-  "approx_count_distinct",
-  "approx_countd"
-];
-var FAN_INVARIANT_AGGS = /* @__PURE__ */ new Set([
-  ...MINMAX_AGGS,
-  "count_distinct",
-  "countd",
-  "approx_count_distinct",
-  "approx_countd"
-]);
-function isFanInvariantAgg(e10) {
-  return FAN_INVARIANT_AGGS.has(e10);
-}
-var SHORTHAND_TABLE_AGGS = /* @__PURE__ */ new Set([
-  ...NUMBER_AGGS,
-  ...MINMAX_AGGS,
-  ...COUNT_AGGS,
-  "count_if"
-]);
-var AGG_PASSTHROUGH_FUNCS = /* @__PURE__ */ new Set([
-  "agg_text",
-  "agg_number",
-  "agg_truefalse",
-  "agg_datetime",
-  "agg_date"
-]);
-function isAggPassthrough(e10) {
-  return AGG_PASSTHROUGH_FUNCS.has(e10);
-}
-var SQL_PASSTHROUGH_FUNCS = /* @__PURE__ */ new Set([
-  "sql_text",
-  "sql_number",
-  "sql_truefalse",
-  "sql_datetime",
-  "sql_date"
-]);
-function invalidPassthroughFuncName(e10) {
-  if (!/^[a-zA-Z0-9_.]+$/.test(e10))
-    return `Invalid function name "${e10}". Function names must contain only alphanumeric characters, underscores, and dots`;
-}
 var CAST_TARGETS = {
   date: SqlType.DATE,
   datetime: SqlType.DATETIME,
@@ -126386,12 +126404,20 @@ function resolveShorthandAggregate(e11, t, n, r3, i, a, s3) {
   let c3 = n[0], l = e11.resolveExpr(c3, r3);
   if (isTableType(l.ty))
     return buildReduce(e11, t, n, r3, i, a, s3);
+  if (isUserConstReference(c3, r3))
+    return e11.dataset.diagnostics.push(createError(ErrorCode.INVALID_SHORTHAND_AGGREGATION_0, i, undefined, shorthandAggregationOverConstMessage(t, c3.value))), finishAggregate(e11, t, [l], errType, i, a);
   if (isFieldType(l.ty)) {
     let u = AggregationArgFold.inspect(l), f = !u.producesRelation && !u.hasQueryLevelExpression ? clearOrigin(e11, [...u.models]) : undefined;
     return f ? buildReduce(e11, t, [isDotExpression(c3) ? c3.left : createIdentifier(f, borrow(c3.loc), true), c3], r3, i, a, s3) : buildReduce(e11, t, n, r3, i, a, s3);
   }
   return e11.dataset.diagnostics.push(createError(ErrorCode.INVALID_SHORTHAND_AGGREGATION_0, i, undefined, shorthandAggregationWithMultipleModelsMessage(t, c3))), buildReduce(e11, t, n, r3, i, a, s3);
 }
+function isUserConstReference(e11, t) {
+  if (!isIdentifier(e11))
+    return false;
+  let n = blockConstExpr(e11.value, t);
+  return n?.kind === "const" && !n.synthetic;
+}
 function buildReduce(e11, t, n, r3, i, a, s3) {
   let c3 = resolveAggregateArgs(e11, n, r3), l = c3.length === 1;
   if (l && isTableType(c3[0].ty) && c3[0].ty.rowType.columns.length !== 1)
@@ -132610,19 +132636,24 @@ function prepareCheck(e16) {
   };
 }
 function checkAql(e16) {
-  let { dataset: t, adhocMetrics: n, adhocDimensions: r3, aql: i, aqlType: a, fieldName: s3, modelUname: c3, userAttributes: l = [], checkFlags: u = CheckFlags.SkipCheckingRelationshipKey, allowAmbiguousPaths: f = false, useV2Compiler: p3 = false } = e16, { datasetStore: m3, fieldDeclarations: S3 } = prepareCheck(e16), w3;
+  let { dataset: t, adhocMetrics: n, adhocDimensions: r3, aql: i, aqlType: a, fieldName: s3, modelUname: c3, userAttributes: l = [], checkFlags: u = CheckFlags.SkipCheckingRelationshipKey, allowAmbiguousPaths: f = false, useV2Compiler: p3 = false, allowAdhocSqlPassthroughFunctions: m3 = true } = e16, { datasetStore: S3, fieldDeclarations: w3 } = prepareCheck(e16), E3;
   try {
-    w3 = parse(i);
+    E3 = parse(i);
   } catch (e17) {
     return [e17];
   }
-  let E3 = a === "dimension" && c3 ? getFqn(c3) : undefined;
+  if (!m3) {
+    let e17 = checkAdhocSqlPassthrough([E3]);
+    if (e17.length > 0)
+      return e17;
+  }
+  let k3 = a === "dimension" && c3 ? getFqn(c3) : undefined;
   if (p3 && a !== "condition") {
     let e17 = resolve({
-      store: m3,
-      program: w3,
-      modelContext: E3,
-      adhocFields: S3,
+      store: S3,
+      program: E3,
+      modelContext: k3,
+      adhocFields: w3,
       userAttributes: l,
       checkFlags: u,
       recordSpanTypes: true,
@@ -132631,31 +132662,39 @@ function checkAql(e16) {
     });
     if (e17.diagnostics.length > 0)
       return e17.diagnostics;
-    let t3 = import_lodash2.last(w3.exprs);
+    let t3 = import_lodash2.last(E3.exprs);
     return t3 === undefined ? SqlType.UNKNOWN : sqlTypeOfCheckedExpression(e17.spanTypes?.at(t3.loc));
   }
-  let k3 = createTypeChecker(m3, l, S3, [], u), N3;
-  if (a === "condition" && (N3 = k3.getDiagnosticsForCondition(w3)), N3 = k3.getDiagnostics(w3, E3), N3.length > 0)
-    return N3;
-  let I3 = import_lodash2.last(w3.exprs)?.id;
-  return I3 === undefined ? SqlType.UNKNOWN : sqlTypeOfCheckedExpression(k3.getTypeFromNodeId(I3));
+  let N3 = createTypeChecker(S3, l, w3, [], u), I3;
+  if (a === "condition" && (I3 = N3.getDiagnosticsForCondition(E3)), I3 = N3.getDiagnostics(E3, k3), I3.length > 0)
+    return I3;
+  let L3 = import_lodash2.last(E3.exprs)?.id;
+  return L3 === undefined ? SqlType.UNKNOWN : sqlTypeOfCheckedExpression(N3.getTypeFromNodeId(L3));
 }
 function checkAqlCondition(e16) {
-  let { userAttributes: t = [], checkFlags: n = CheckFlags.SkipCheckingRelationshipKey, useV2Compiler: r3 = false } = e16, i;
+  let { userAttributes: t = [], checkFlags: n = CheckFlags.SkipCheckingRelationshipKey, useV2Compiler: r3 = false, allowAdhocSqlPassthroughFunctions: i = true } = e16, a;
   try {
-    i = parse(e16.aql);
+    a = parse(e16.aql);
   } catch (e17) {
     return {
       diagnostics: [e17],
       conditionType: "normal"
     };
   }
-  let { datasetStore: a, fieldDeclarations: s3 } = prepareCheck(e16);
+  if (!i) {
+    let e17 = checkAdhocSqlPassthrough([a]);
+    if (e17.length > 0)
+      return {
+        diagnostics: e17,
+        conditionType: "normal"
+      };
+  }
+  let { datasetStore: s3, fieldDeclarations: c3 } = prepareCheck(e16);
   if (r3) {
     let e17 = resolve({
-      store: a,
-      program: i,
-      adhocFields: s3,
+      store: s3,
+      program: a,
+      adhocFields: c3,
       userAttributes: t,
       checkFlags: n,
       typeCheckOnly: true,
@@ -132666,13 +132705,13 @@ function checkAqlCondition(e16) {
       conditionType: e17.conditionKind ?? "normal"
     };
   }
-  let c3 = createTypeChecker(a, t, s3, [], n), l = c3.getDiagnosticsForCondition(i);
-  return l.length > 0 ? {
-    diagnostics: l,
+  let l = createTypeChecker(s3, t, c3, [], n), u = l.getDiagnosticsForCondition(a);
+  return u.length > 0 ? {
+    diagnostics: u,
     conditionType: "normal"
   } : {
-    diagnostics: l,
-    conditionType: c3.measure_conditions.getMeasureCondition(i.exprs[0]) ? "measure" : "normal"
+    diagnostics: u,
+    conditionType: l.measure_conditions.getMeasureCondition(a.exprs[0]) ? "measure" : "normal"
   };
 }
 function createFieldRelationshipChecker(e16) {
@@ -137472,6 +137511,12 @@ function baseTreeParts(e17, t) {
     t3.extend !== undefined && !isCrossModelExtend(e17, t3) && r3.push(...extendDef(e17, t3.extend).parts), t3 !== n && r3.push(...t3.parts ?? []);
   }), r3;
 }
+function expandTreeLodParts(e17, t) {
+  let n = (t3) => t3.extend === undefined ? [] : extendDef(e17, t3.extend).parts, r3 = [];
+  return walkTree(t, (i) => {
+    i !== t && !isCrossModelExtend(e17, i) && r3.push(...n(i));
+  }), [...t.extend === undefined ? [] : [...n(t), ...baseTreeParts(e17, extendDef(e17, t.extend))], ...r3];
+}
 function extendRootRelation(e17, t, n) {
   if (sealedSlot(e17, t))
     return lowerSealedSlot(e17, t, n);
@@ -138277,45 +138322,34 @@ function lowerReduceUncached(e17, t, n) {
       });
     }
     return i.kind === Kind.IDENTIFIER ? buildJoinScope(t, i.name, refRowColumns(i), []) : unsupported$1(`reduce source kind '${i.kind}'`);
-  })(), w3 = (e18) => e18.extend === undefined ? [] : extendDef(t, e18.extend).parts, E3 = (e18) => e18.extend === undefined ? [] : [...w3(e18), ...baseTreeParts(t, extendDef(t, e18.extend))], k3 = (e18) => isCrossModelExtend(t, e18) ? [] : w3(e18), N3 = (() => {
-    if (i.kind !== "expand_model")
-      return [...s3];
-    let e18 = [];
-    return walkTree(i, (t3) => {
-      t3 !== i && e18.push(...k3(t3));
-    }), [
-      ...E3(i),
-      ...e18,
-      ...s3
-    ];
-  })(), I3 = inlineExtendComputed(scopeExtendComputedAll(t, i)), L3 = S3.arity, U3 = attachLodParts(e17, t, S3, N3, S3.relation, L3), pe3 = U3.base;
-  L3 = U3.arity;
-  let { partOf: me3 } = U3, Ze4 = i.kind === "expand_model" ? membershipBranches(i) : [], yr4 = Ze4.length > 0;
-  if (a.length > 0 && !yr4) {
-    let e18 = (e19) => me3(e19) ?? S3.indexOf(e19), n3 = (e19) => me3(e19) != null || S3.tryIndexOf(e19) != null;
-    pe3 = filterKeepingArity(pe3, a.map((r4) => scalarToPlan(inlineDeclDims(t, I3(r4), n3), e18)));
-  }
-  let oi3 = scopeExtendComputed(t, i), ci3 = (e18) => {
+  })(), w3 = i.kind === "expand_model" ? [...expandTreeLodParts(t, i), ...s3] : [...s3], E3 = inlineExtendComputed(scopeExtendComputedAll(t, i)), k3 = S3.arity, N3 = attachLodParts(e17, t, S3, w3, S3.relation, k3), I3 = N3.base;
+  k3 = N3.arity;
+  let { partOf: L3 } = N3, U3 = i.kind === "expand_model" ? membershipBranches(i) : [], pe3 = U3.length > 0;
+  if (a.length > 0 && !pe3) {
+    let e18 = (e19) => L3(e19) ?? S3.indexOf(e19), n3 = (e19) => L3(e19) != null || S3.tryIndexOf(e19) != null;
+    I3 = filterKeepingArity(I3, a.map((r4) => scalarToPlan(inlineDeclDims(t, E3(r4), n3), e18)));
+  }
+  let me3 = scopeExtendComputed(t, i), Ze4 = (e18) => {
     let n3 = aliasedOrigin(t, e18);
     return n3 ? S3.scope.tryResolveOrigin(n3) : undefined;
-  }, li3 = columnResolver((e18) => ci3(e18) ?? me3(e18) ?? S3.indexOf(e18), (e18) => ci3(e18) ?? me3(e18) ?? S3.tryResolve(e18)), di3 = oi3.map((e18) => scalarToPlan(I3(e18.expr), li3)), fi3 = oi3.map((e18) => e18.origin), pi3 = /* @__PURE__ */ new Map;
-  fi3.forEach((e18, t3) => pi3.set(originKey(e18), L3 + t3));
-  let mi3 = (e18) => {
+  }, yr4 = columnResolver((e18) => Ze4(e18) ?? L3(e18) ?? S3.indexOf(e18), (e18) => Ze4(e18) ?? L3(e18) ?? S3.tryResolve(e18)), oi3 = me3.map((e18) => scalarToPlan(E3(e18.expr), yr4)), ci3 = me3.map((e18) => e18.origin), li3 = /* @__PURE__ */ new Map;
+  ci3.forEach((e18, t3) => li3.set(originKey(e18), k3 + t3));
+  let di3 = (e18) => {
     let t3 = e18;
     for (;t3.kind === Kind.NAMED_EXPRESSION; )
       t3 = t3.expr;
     let n3 = t3.kind === Kind.IDENTIFIER ? refOrigin(t3) : undefined;
-    return n3 ? pi3.get(originKey(n3)) : undefined;
-  }, hi3 = (e18) => me3(e18) ?? mi3(e18) ?? S3.indexOf(e18), gi3 = (e18) => me3(e18) ?? mi3(e18) ?? S3.tryIndexOf(e18), _i3 = L3 + di3.length, vi3 = relationType(S3.relation), yi3 = [], bi3 = [], xi3 = (e18) => {
+    return n3 ? li3.get(originKey(n3)) : undefined;
+  }, fi3 = (e18) => L3(e18) ?? di3(e18) ?? S3.indexOf(e18), pi3 = (e18) => L3(e18) ?? di3(e18) ?? S3.tryIndexOf(e18), mi3 = k3 + oi3.length, hi3 = relationType(S3.relation), gi3 = [], _i3 = [], vi3 = (e18) => {
     if (!e18 || !isSubtimeField(e18))
       return;
     let [t3] = e18.fieldName.split("->");
     if (S3.scope.tryResolveOrigin(createModelFieldReference(e18.modelName, t3)) == null)
       return S3.scope.tryResolveOrigin(e18);
-  }, Si2 = (e18) => e18.kind === Kind.IDENTIFIER ? me3(e18) != null : e18.kind === Kind.FUNCTION_CALL ? e18.args.some(Si2) : e18.kind === Kind.NAMED_EXPRESSION && Si2(e18.expr), Ci3 = (e18) => {
-    if (!Si2(e18)) {
+  }, yi3 = (e18) => e18.kind === Kind.IDENTIFIER ? L3(e18) != null : e18.kind === Kind.FUNCTION_CALL ? e18.args.some(yi3) : e18.kind === Kind.NAMED_EXPRESSION && yi3(e18.expr), bi3 = (e18) => {
+    if (!yi3(e18)) {
       let t3 = refOrigin(e18);
-      if (t3 && isSubtimeField(t3) && xi3(t3) != null)
+      if (t3 && isSubtimeField(t3) && vi3(t3) != null)
         return {
           kind: Kind.IDENTIFIER,
           id: e18.id,
@@ -138326,40 +138360,40 @@ function lowerReduceUncached(e17, t, n) {
     }
     return e18.kind === Kind.FUNCTION_CALL ? {
       ...e18,
-      args: e18.args.map(Ci3)
+      args: e18.args.map(bi3)
     } : e18.kind === Kind.NAMED_EXPRESSION ? {
       ...e18,
-      expr: Ci3(e18.expr)
+      expr: bi3(e18.expr)
     } : e18;
-  }, wi3 = (e18) => {
+  }, xi3 = (e18) => {
     let n3 = scopeExtendComputedAll(t, i).find((t3) => originKey(t3.origin) === originKey(e18));
-    return n3 ? scalarToPlan(I3(n3.expr), li3) : undefined;
-  }, Ti3 = r3.map((e18) => {
-    let t3 = gi3(e18);
+    return n3 ? scalarToPlan(E3(n3.expr), yr4) : undefined;
+  }, Si2 = r3.map((e18) => {
+    let t3 = pi3(e18);
     if (t3 != null)
       return t3;
-    let n3 = refOrigin(e18), r4 = Si2(e18), i3 = r4 ? undefined : xi3(n3);
+    let n3 = refOrigin(e18), r4 = yi3(e18), i3 = r4 ? undefined : vi3(n3);
     if (i3 == null && !r4) {
       let t4 = e18;
       for (;t4.kind === Kind.NAMED_EXPRESSION; )
         t4 = t4.expr;
-      t4 !== e18 && (i3 = xi3(refOrigin(t4)));
+      t4 !== e18 && (i3 = vi3(refOrigin(t4)));
     }
-    return i3 ?? (!r4 && e18.kind === Kind.IDENTIFIER && n3 && isSubtimeField(n3) ? yi3.push(subtimeGrainScalar(S3, vi3, n3, wi3)) : r4 ? yi3.push(scalarToPlan(Ci3(I3(e18)), hi3)) : yi3.push(scalarToPlan(rewriteNestedSubtimes(I3(e18), (e19) => gi3(e19) != null), hi3)), bi3.push(n3), _i3 + yi3.length - 1);
-  }), Ei3 = [...di3, ...yi3], Di3 = [...fi3, ...bi3], Oi3 = attachSemiJoins(e17, t, Ei3.length > 0 ? cons({
+    return i3 ?? (!r4 && e18.kind === Kind.IDENTIFIER && n3 && isSubtimeField(n3) ? gi3.push(subtimeGrainScalar(S3, hi3, n3, xi3)) : r4 ? gi3.push(scalarToPlan(bi3(E3(e18)), fi3)) : gi3.push(scalarToPlan(rewriteNestedSubtimes(E3(e18), (e19) => pi3(e19) != null), fi3)), _i3.push(n3), mi3 + gi3.length - 1);
+  }), Ci3 = [...oi3, ...gi3], wi3 = [...ci3, ..._i3], Ti3 = attachSemiJoins(e17, t, Ci3.length > 0 ? cons({
     kind: "map",
-    input: pe3,
-    scalars: Ei3,
-    origins: Di3
-  }) : pe3, hi3, m3, (e18) => rewriteNestedSubtimes(I3(e18), (e19) => gi3(e19) != null)), ki4 = Ze4.reduce((n3, r4) => joinExistenceFilter(e17, t, n3, S3, r4), Oi3);
+    input: I3,
+    scalars: Ci3,
+    origins: wi3
+  }) : I3, fi3, m3, (e18) => rewriteNestedSubtimes(E3(e18), (e19) => pi3(e19) != null)), Ei3 = U3.reduce((n3, r4) => joinExistenceFilter(e17, t, n3, S3, r4), Ti3);
   return {
     reduce: cons({
       kind: "reduce",
-      input: a.length > 0 && yr4 ? filterKeepingArity(ki4, a.map((e18) => scalarToPlan(inlineDeclDims(t, I3(e18), (e19) => gi3(e19) != null), hi3))) : ki4,
-      groupKey: Ti3,
+      input: a.length > 0 && pe3 ? filterKeepingArity(Ei3, a.map((e18) => scalarToPlan(inlineDeclDims(t, E3(e18), (e19) => pi3(e19) != null), fi3))) : Ei3,
+      groupKey: Si2,
       aggregates: c3.map((e18) => ({
         func: e18.name.name,
-        args: e18.args.length > 0 ? e18.args.map((e19) => scalarToPlan(e19, hi3)) : [{
+        args: e18.args.length > 0 ? e18.args.map((e19) => scalarToPlan(e19, fi3)) : [{
           kind: "literal",
           literal: "number",
           value: "1",
@@ -138378,7 +138412,7 @@ function lowerReduceUncached(e17, t, n) {
       annotations: n.annotations,
       ...n.distinct ? { preferDistinct: true } : {}
     }),
-    grainLen: Ti3.length
+    grainLen: Si2.length
   };
 }
 function lowerWindow(e17, t, n) {
@@ -138982,54 +139016,52 @@ function lowerSelect(e17, t, n) {
   }
   if (r3.kind !== Kind.IDENTIFIER && r3.kind !== "expand_model")
     return lowerSelectOver(n, lowerTop(e17, t, r3, originLeafRefs(n.projection)));
-  let a = r3.kind === "expand_model" && r3.extend !== undefined && !isCrossModelExtend(t, r3) ? r3 : undefined, { projection: s3 } = n, c3 = i, l, u;
-  r3.kind === "expand_model" ? (l = r3.model, u = undefined) : (l = refRootModel(r3) ?? r3.name, u = refRowColumns(r3));
-  let f = r3.kind === "expand_model" && isCrossModelExtend(t, r3) ? lowerExtendRelation(t, r3) : undefined, p3 = (() => {
+  let { projection: a } = n, s3 = i, c3, l;
+  r3.kind === "expand_model" ? (c3 = r3.model, l = undefined) : (c3 = refRootModel(r3) ?? r3.name, l = refRowColumns(r3));
+  let u = r3.kind === "expand_model" && isCrossModelExtend(t, r3) ? lowerExtendRelation(t, r3) : undefined, f = (() => {
     if (r3.kind !== "expand_model")
-      return buildJoinScope(t, l, u, [], { rootRel: f });
+      return buildJoinScope(t, c3, l, [], { rootRel: u });
     let { edges: n3, fanouts: i3 } = partitionFanoutExpansions(t, r3, e17), a3 = [];
     walkTree(r3, (e18) => {
       e18 !== r3 && a3.push(e18);
     });
     let s4 = crossModelSubstitute(t, a3.filter((e18) => isCrossModelExtend(t, e18)), scopeModelsOf(r3), e17);
-    return buildJoinScope(t, l, u, n3, {
-      rootRel: f,
+    return buildJoinScope(t, c3, l, n3, {
+      rootRel: u,
       fanouts: i3,
       substitute: s4,
       tree: r3
     });
-  })(), m3 = scopeExtendComputed(t, r3), S3 = inlineExtendComputed(scopeExtendComputedAll(t, r3)), { scalars: w3, tableConds: E3 } = splitTableConditions(c3), k3 = w3.length > 0 ? filterKeepingArity(p3.relation, w3.map((e18) => scalarToPlan(S3(e18), p3.indexOf))) : p3.relation;
-  k3 = attachSemiJoins(e17, t, k3, p3.indexOf, E3, S3), r3.kind === "expand_model" && (k3 = membershipBranches(r3).reduce((n3, r4) => joinExistenceFilter(e17, t, n3, p3, r4), k3));
-  let N3 = arity(k3), I3 = attachLodParts(e17, t, p3, a?.extend === undefined ? [] : extendDef(t, a.extend).parts, k3, N3);
-  ({ base: k3 } = I3), N3 = I3.arity;
-  let { partOf: L3 } = I3, U3 = (e18) => {
+  })(), p3 = scopeExtendComputed(t, r3), m3 = inlineExtendComputed(scopeExtendComputedAll(t, r3)), S3 = attachLodParts(e17, t, f, r3.kind === "expand_model" ? expandTreeLodParts(t, r3) : [], f.relation, arity(f.relation)), { partOf: w3 } = S3, { scalars: E3, tableConds: k3 } = splitTableConditions(s3), N3 = (e18) => w3(e18) ?? f.indexOf(e18), I3 = E3.length > 0 ? filterKeepingArity(S3.base, E3.map((e18) => scalarToPlan(m3(e18), N3))) : S3.base;
+  I3 = attachSemiJoins(e17, t, I3, N3, k3, m3), r3.kind === "expand_model" && (I3 = membershipBranches(r3).reduce((n3, r4) => joinExistenceFilter(e17, t, n3, f, r4), I3));
+  let L3 = arity(I3), U3 = (e18) => {
     let n3 = aliasedOrigin(t, e18);
     if (n3) {
-      let e19 = p3.scope.tryResolveOrigin(n3);
+      let e19 = f.scope.tryResolveOrigin(n3);
       if (e19 != null)
         return e19;
     }
-    return L3(e18) ?? p3.indexOf(e18);
-  }, pe3 = m3.map((e18) => scalarToPlan(S3(e18.expr), U3)), me3 = m3.map((e18) => e18.origin), Ze4 = /* @__PURE__ */ new Map;
-  me3.forEach((e18, t3) => Ze4.set(originKey(e18), N3 + t3));
+    return w3(e18) ?? f.indexOf(e18);
+  }, pe3 = p3.map((e18) => scalarToPlan(m3(e18.expr), U3)), me3 = p3.map((e18) => e18.origin), Ze4 = /* @__PURE__ */ new Map;
+  me3.forEach((e18, t3) => Ze4.set(originKey(e18), L3 + t3));
   let yr4 = (e18) => {
-    let t3 = L3(e18);
+    let t3 = w3(e18);
     if (t3 != null)
       return t3;
     let n3 = e18.kind === Kind.IDENTIFIER ? refOrigin(e18) : undefined;
-    return (n3 ? Ze4.get(originKey(n3)) : undefined) ?? p3.indexOf(e18);
+    return (n3 ? Ze4.get(originKey(n3)) : undefined) ?? f.indexOf(e18);
   }, oi3 = [...pe3], ci3 = [...me3], li3 = [], di3 = [], fi3 = (e18, t3, n3) => {
     di3.push(e18), li3.push({
       name: t3,
       origin: n3
     });
   }, pi3 = (e18, t3, n3) => {
-    oi3.push(e18), ci3.push(n3), di3.push(N3 + oi3.length - 1), li3.push({
+    oi3.push(e18), ci3.push(n3), di3.push(L3 + oi3.length - 1), li3.push({
       name: t3,
       origin: n3
     });
   };
-  return s3.forEach((e18, t3) => {
+  return a.forEach((e18, t3) => {
     if (e18.kind === Kind.NAMED_EXPRESSION) {
       let { name: t4 } = e18.name, n3 = refOrigin(e18) ?? refOrigin(e18.expr);
       e18.expr.kind === Kind.IDENTIFIER && isColumnRef(e18.expr) ? fi3(yr4(e18.expr), t4, n3) : pi3(scalarToPlan(e18.expr, yr4), t4, n3);
@@ -139040,10 +139072,10 @@ function lowerSelect(e17, t, n) {
       kind: "project",
       input: oi3.length > 0 ? cons({
         kind: "map",
-        input: k3,
+        input: I3,
         scalars: oi3,
         origins: ci3.some((e18) => e18) ? ci3 : undefined
-      }) : k3,
+      }) : I3,
       outputs: di3
     }),
     outputs: li3
@@ -145093,18 +145125,23 @@ function getDiagnosticsV2(e17, { store: t, userAttributes: n = [], checkFlags: r
     typeCheckOnly: true
   }).diagnostics;
 }
-function _compile(e17, { referenceTime: t = /* @__PURE__ */ new Date, timezoneRegion: n, databaseTimezone: r3 = "Etc/UTC", fallbackValueTimezoneRegion: i = "Etc/UTC", valueDatetimeFormat: a = "%FT%T.%L%:z", weekStartDay: s3, sqlGenerationFlags: c3, adhocFields: l = [], userAttributes: u, rowLevelPermissions: f, strictUserPermissionCheck: p3 = false, shouldDecomposeFanoutAggregate: m3 = false, calendarRange: S3 = [new Date(1900, 0, 1), new Date(3001, 0, 1)], useV2Compiler: w3 = false, store: E3, globals: k3 = createAmqlGlobals(), checkFlags: N3 = CheckFlags.Normal }) {
-  let I3 = parse(e17, "<main>"), L3 = parseAdhocFields(l);
-  if (c3?.shouldPrioritizeLengthForMixedPaths && (E3.modelGraph.shouldPrioritizeLengthForMixedPaths = true), w3) {
+function _compile(e17, { referenceTime: t = /* @__PURE__ */ new Date, timezoneRegion: n, databaseTimezone: r3 = "Etc/UTC", fallbackValueTimezoneRegion: i = "Etc/UTC", valueDatetimeFormat: a = "%FT%T.%L%:z", weekStartDay: s3, sqlGenerationFlags: c3, adhocFields: l = [], userAttributes: u, rowLevelPermissions: f, strictUserPermissionCheck: p3 = false, shouldDecomposeFanoutAggregate: m3 = false, calendarRange: S3 = [new Date(1900, 0, 1), new Date(3001, 0, 1)], useV2Compiler: w3 = false, allowAdhocSqlPassthroughFunctions: E3 = true, store: k3, globals: N3 = createAmqlGlobals(), checkFlags: I3 = CheckFlags.Normal }) {
+  let L3 = parse(e17, "<main>"), U3 = parseAdhocFields(l);
+  if (!E3) {
+    let e18 = checkAdhocSqlPassthrough([L3, ...U3]);
+    if (e18.length > 0)
+      throw createAqlTypecheckError(e18);
+  }
+  if (c3?.shouldPrioritizeLengthForMixedPaths && (k3.modelGraph.shouldPrioritizeLengthForMixedPaths = true), w3) {
     let e18 = resolve({
-      program: I3,
-      store: E3,
-      adhocFields: L3,
+      program: L3,
+      store: k3,
+      adhocFields: U3,
       recordSpanTypes: true,
       userAttributes: u,
       rowLevelPermissions: f,
       strictUserPermissionCheck: p3,
-      checkFlags: N3,
+      checkFlags: I3,
       sqlGenerationFlags: c3,
       datetime: {
         timezoneRegion: n,
@@ -145125,14 +145162,14 @@ function _compile(e17, { referenceTime: t = /* @__PURE__ */ new Date, timezoneRe
       sqlGenerationFlags: c3
     });
     return {
-      expr: I3,
+      expr: L3,
       explore: m4,
       context: w4,
       json: exploreToJSON(w4, m4),
       spanTypes: e18.spanTypes
     };
   }
-  E3.setModel(buildCalendarModel({
+  k3.setModel(buildCalendarModel({
     calendarRange: S3,
     referenceTime: t,
     timezoneRegion: n,
@@ -145140,11 +145177,11 @@ function _compile(e17, { referenceTime: t = /* @__PURE__ */ new Date, timezoneRe
     fallbackValueTimezoneRegion: i,
     valueDatetimeFormat: a,
     weekStartDay: s3
-  }, E3.dataSource));
-  let U3 = createTypeChecker(E3, u, L3, f, N3), pe3 = U3.getDiagnostics(I3);
-  if (pe3.length > 0)
-    throw createAqlTypecheckError(pe3);
-  return compileAst(I3, {
+  }, k3.dataSource));
+  let pe3 = createTypeChecker(k3, u, U3, f, I3), me3 = pe3.getDiagnostics(L3);
+  if (me3.length > 0)
+    throw createAqlTypecheckError(me3);
+  return compileAst(L3, {
     referenceTime: t,
     timezoneRegion: n,
     databaseTimezone: r3,
@@ -145152,15 +145189,15 @@ function _compile(e17, { referenceTime: t = /* @__PURE__ */ new Date, timezoneRe
     valueDatetimeFormat: a,
     weekStartDay: s3,
     sqlGenerationFlags: c3,
-    adhocFieldDeclarations: L3,
+    adhocFieldDeclarations: U3,
     userAttributes: u,
     rowLevelPermissions: f,
     strictUserPermissionCheck: p3,
     shouldDecomposeFanoutAggregate: m3,
     calendarRange: S3,
-    store: E3,
-    globals: k3,
-    checker: U3
+    store: k3,
+    globals: N3,
+    checker: pe3
   });
 }
 var compile = Rr3.wrapFuncWithinActiveSpan(_compile);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@holistics/cli-core",
   "type": "module",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "bin": {
     "holistics": "./bin/holistics.js"
   },