@dbsp/nql 1.5.0 → 1.7.0

package/dist/index.js

@@ -1,5 +1,5 @@
-import { NQL_INTERNAL_COMPILER_OPTIONS, markNqlTrustedRelationFilter, createNqlBindingRef, isNqlBindingRef, getNqlBindingRefName } from '@dbsp/types/internal';
-import { NQL_SELECT_AGGREGATE_FUNCTIONS, NQL_SELECT_VALUE_FUNCTIONS, NQL_SELECT_JSON_FUNCTIONS, NQL_SELECT_SCALAR_FUNCTIONS, isNqlSelectWindowFunctionAllowed, isRankingWindowFunction, isParamIntent } from '@dbsp/types';
+import { NQL_INTERNAL_COMPILER_OPTIONS, explainUnsupportedNqlBindingIncludeHop, markNqlTrustedRelationFilter, createNqlBindingRef, isNqlBindingRef, getNqlBindingRefName } from '@dbsp/types/internal';
+import { NQL_SELECT_AGGREGATE_FUNCTIONS, NQL_SELECT_VALUE_FUNCTIONS, NQL_SELECT_JSON_FUNCTIONS, NQL_SELECT_SCALAR_FUNCTIONS, toColumnList, isNqlSelectWindowFunctionAllowed, isRankingWindowFunction, isParamIntent } from '@dbsp/types';
 import { createToken, Lexer, CstParser } from 'chevrotain';
 
 // src/compiler/index.ts
@@ -43,6 +43,28 @@ var NqlSemanticException = class extends Error {
     this.relatedSymbol = relatedSymbol;
   }
 };
+var DEFAULT_RELATION_TARGET_COLUMN = "id";
+function relationForeignKeys(relation) {
+  if (!relation) return void 0;
+  const columns = toColumnList(relation.foreignKey);
+  return columns.length > 0 ? columns : void 0;
+}
+function relationCardinality(relation) {
+  return relation?.type === "hasMany" || relation?.type === "belongsToMany" ? "many" : "one";
+}
+function scalarRelationJoinColumns(relation) {
+  if (!relation) return void 0;
+  if (relation.type !== "belongsTo" && relation.type !== "hasOne" && relation.type !== "hasMany") {
+    return void 0;
+  }
+  const fkColumns = relationForeignKeys(relation);
+  if (!fkColumns) return void 0;
+  const sourceKeys = toColumnList(relation.sourceKey);
+  const targetKeys = toColumnList(relation.targetKey);
+  const sourceJoinColumn = relation.type === "belongsTo" ? fkColumns : sourceKeys.length > 0 ? sourceKeys : [DEFAULT_RELATION_TARGET_COLUMN];
+  const targetJoinColumn = relation.type === "belongsTo" ? targetKeys.length > 0 ? targetKeys : [DEFAULT_RELATION_TARGET_COLUMN] : fkColumns;
+  return { sourceJoinColumn, targetJoinColumn };
+}
 
 // src/compiler/column-validator.ts
 var ColumnValidator = class _ColumnValidator {
@@ -92,6 +114,12 @@ var ColumnValidator = class _ColumnValidator {
     if (virtualColumns) return virtualColumns;
     return this.schema.getTable(name)?.columns.map((column) => column.name);
   }
+  getPhysicalTableColumns(name) {
+    return this.schema.getTable(name)?.columns.map((column) => column.name);
+  }
+  getPseudoColumns(name) {
+    return this.schema.getTable(name)?.pseudoColumns ?? [];
+  }
   hasPhysicalTable(name) {
     return !this.virtualBindingTables.has(name) && !!this.schema.getTable(name);
   }
@@ -110,6 +138,88 @@ var ColumnValidator = class _ColumnValidator {
   getVirtualBindingScalarRelation(bindingName, relationName) {
     return this.virtualBindingRelationFilters.get(bindingName)?.scalarRelations?.find((relation) => relation.relation === relationName);
   }
+  static virtualRelationIncludeShape(relation) {
+    const relationType = relation.relationType;
+    const foreignKey = relationType === "belongsTo" ? relation.sourceColumn : relation.targetColumn;
+    return {
+      type: relationType,
+      foreignKey,
+      source: relation.sourceTable,
+      target: relation.targetTable
+    };
+  }
+  resolveVirtualBindingScalarRelationForInclude(bindingName, relationPath) {
+    const relationName = relationPath.join(".");
+    if (relationPath.length < 1) {
+      throw new NqlSemanticException(
+        NqlErrorCodes.SEM_INVALID_SYNTAX,
+        `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relationName}' (ref-#192): the relation path must name a source-table relation.`
+      );
+    }
+    const relation = relationPath[0];
+    if (!relation) {
+      throw new NqlSemanticException(
+        NqlErrorCodes.SEM_INVALID_SYNTAX,
+        `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relationName}' (ref-#192): the relation path must name a source-table relation.`
+      );
+    }
+    const virtualRelation = this.getVirtualBindingScalarRelation(
+      bindingName,
+      relation
+    );
+    if (virtualRelation) {
+      const resolvedFirstHop = this.getRelation(virtualRelation.sourceTable, relation) ?? _ColumnValidator.virtualRelationIncludeShape(virtualRelation);
+      const unsupportedFirstHopReason = explainUnsupportedNqlBindingIncludeHop(
+        relation,
+        resolvedFirstHop,
+        { relation }
+      );
+      if (unsupportedFirstHopReason) {
+        throw new NqlSemanticException(
+          NqlErrorCodes.SEM_INVALID_SYNTAX,
+          `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relationName}' (ref-#192): ${unsupportedFirstHopReason}.`
+        );
+      }
+      let sourceTable = virtualRelation.targetTable;
+      for (let i = 1; i < relationPath.length; i++) {
+        const tailRelation = relationPath[i];
+        if (!tailRelation) {
+          throw new NqlSemanticException(
+            NqlErrorCodes.SEM_INVALID_SYNTAX,
+            `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relationName}' (ref-#192): relation path segment ${i + 1} is empty.`
+          );
+        }
+        const resolvedTail = this.getRelation(sourceTable, tailRelation);
+        if (!resolvedTail) {
+          throw new NqlSemanticException(
+            NqlErrorCodes.SEM_INVALID_SYNTAX,
+            `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relationName}' (ref-#192): tail relation '${tailRelation}' is not declared on table '${sourceTable}'.`
+          );
+        }
+        const unsupportedReason = explainUnsupportedNqlBindingIncludeHop(
+          tailRelation,
+          resolvedTail,
+          { relation: tailRelation }
+        );
+        if (unsupportedReason) {
+          throw new NqlSemanticException(
+            NqlErrorCodes.SEM_INVALID_SYNTAX,
+            `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relationName}' (ref-#192): tail ${unsupportedReason}.`
+          );
+        }
+        sourceTable = resolvedTail.target;
+      }
+      return virtualRelation;
+    }
+    const reason = this.explainVirtualBindingScalarRelationRejection(
+      bindingName,
+      relation
+    );
+    throw new NqlSemanticException(
+      NqlErrorCodes.SEM_INVALID_SYNTAX,
+      `Query '${bindingName}' reads from an NQL binding and cannot use relation include '${relation}' (ref-#192): ${reason}.`
+    );
+  }
   explainVirtualBindingRelationRejection(bindingName, relationName) {
     const metadata = this.virtualBindingRelationFilters.get(bindingName);
     if (!metadata) {
@@ -124,27 +234,24 @@ var ColumnValidator = class _ColumnValidator {
     if (!relation) {
       return `relation '${relationName}' is not declared on source table '${sourceTable}'`;
     }
-    const fk = relation.foreignKey;
-    const fkColumns = typeof fk === "string" ? [fk] : Array.isArray(fk) ? [...fk] : [];
+    const fkColumns = toColumnList(relation.foreignKey);
     if (relation.type !== "belongsTo") {
       return `relation '${relationName}' is '${relation.type ?? "unknown"}'; A-lite only supports relations whose FK column is on the binding source table`;
     }
-    if (fkColumns.length !== 1) {
-      return `relation '${relationName}' must have exactly one FK column for A-lite binding relation filters`;
+    if (fkColumns.length === 0) {
+      return `relation '${relationName}' must have at least one FK column for A-lite binding relation filters`;
     }
-    const fkColumn = fkColumns[0];
-    if (fkColumn === void 0) {
-      return `relation '${relationName}' must have exactly one FK column for A-lite binding relation filters`;
-    }
-    const directProjection = metadata.directProjectionLineage?.find(
-      (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, fkColumn)
-    );
-    if (!directProjection) {
-      const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
-      return `relation '${relationName}' FK column '${fkColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
+    for (const fkColumn of fkColumns) {
+      const directProjection = metadata.directProjectionLineage?.find(
+        (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, fkColumn)
+      );
+      if (!directProjection) {
+        const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
+        return `relation '${relationName}' FK column '${fkColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
+      }
     }
     const available = this.virtualBindingTables.get(bindingName)?.join(", ");
-    return `relation '${relationName}' FK column '${fkColumn}' is not available through binding '${bindingName}'${available ? ` (available columns: ${available})` : ""}`;
+    return `relation '${relationName}' FK columns '${fkColumns.join(", ")}' are not available through binding '${bindingName}'${available ? ` (available columns: ${available})` : ""}`;
   }
   explainVirtualBindingScalarRelationRejection(bindingName, relationName) {
     const metadata = this.virtualBindingRelationFilters.get(bindingName);
@@ -156,33 +263,131 @@ var ColumnValidator = class _ColumnValidator {
     if (!sourceTable) {
       return "the binding source table could not be proven";
     }
+    const recursiveReason = this.explainVirtualBindingRecursiveScalarRelationRejection(
+      bindingName,
+      relationName,
+      sourceTable,
+      metadata
+    );
+    if (recursiveReason) return recursiveReason;
     const relation = this.getRelation(sourceTable, relationName);
     if (!relation) {
       return `relation '${relationName}' is not declared on source table '${sourceTable}'`;
     }
-    const fk = relation.foreignKey;
-    const fkColumns = typeof fk === "string" ? [fk] : Array.isArray(fk) ? [...fk] : [];
-    if (relation.type !== "belongsTo" && relation.type !== "hasOne") {
-      return `relation '${relationName}' is '${relation.type ?? "unknown"}'; binding relation columns require a scalar belongsTo/hasOne relation`;
-    }
-    if (fkColumns.length !== 1) {
-      return `relation '${relationName}' must have exactly one FK column for binding relation columns`;
-    }
-    const fkColumn = fkColumns[0];
-    if (fkColumn === void 0) {
-      return `relation '${relationName}' must have exactly one FK column for binding relation columns`;
+    if (relation.type === "belongsToMany") {
+      if (relation.recursive !== void 0 || relation.source !== void 0 && relation.source === relation.target) {
+        return `relation '${relationName}' is recursive/self-referential; binding relation columns for recursive relations require recursive CTE handling and are not supported (ref-#193)`;
+      }
+      if (typeof relation.through !== "string" || relation.through.length === 0) {
+        return `relation '${relationName}' is many-to-many but does not declare a resolvable junction table (ref-#192)`;
+      }
+      const sourceColumns2 = toColumnList(relation.sourceKey).length > 0 ? toColumnList(relation.sourceKey) : ["id"];
+      const throughSourceColumns = toColumnList(relation.foreignKey);
+      const throughTargetColumns = toColumnList(relation.otherKey);
+      const targetColumns = toColumnList(relation.targetKey).length > 0 ? toColumnList(relation.targetKey) : ["id"];
+      if (sourceColumns2.length !== 1) {
+        return `relation '${relationName}' source key is composite; binding many-to-many relation columns require a single source key column (ref-#179)`;
+      }
+      if (throughSourceColumns.length !== 1) {
+        return `relation '${relationName}' junction source FK is composite or missing; binding many-to-many relation columns require a single junction source FK column (ref-#179)`;
+      }
+      if (throughTargetColumns.length !== 1) {
+        return `relation '${relationName}' junction target FK is composite or missing; binding many-to-many relation columns require a single junction target FK column (ref-#179)`;
+      }
+      if (targetColumns.length !== 1) {
+        return `relation '${relationName}' target key is composite; binding many-to-many relation columns require a single target key column (ref-#179)`;
+      }
+      const [sourceColumn] = sourceColumns2;
+      if (sourceColumn === void 0) {
+        return `relation '${relationName}' source key is missing; binding many-to-many relation columns require a single source key column (ref-#179)`;
+      }
+      const directProjection = metadata.directProjectionLineage?.find(
+        (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, sourceColumn)
+      );
+      if (!directProjection) {
+        const available3 = this.virtualBindingTables.get(bindingName)?.join(", ");
+        return `relation '${relationName}' source key column '${sourceColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available3 ? ` (available columns: ${available3})` : ""}`;
+      }
+      const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
+      return `relation '${relationName}' many-to-many source column '${sourceColumn}' is not available through binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
     }
-    const sourceColumn = relation.type === "belongsTo" ? fkColumn : relation.sourceKey ?? "id";
-    const directProjection = metadata.directProjectionLineage?.find(
-      (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, sourceColumn)
+    const unsupportedReason = explainUnsupportedNqlBindingIncludeHop(
+      relationName,
+      relation
     );
-    if (!directProjection) {
-      const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
-      const sourceColumnLabel = relation.type === "belongsTo" ? "FK column" : "source key column";
-      return `relation '${relationName}' ${sourceColumnLabel} '${sourceColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
+    if (unsupportedReason) return unsupportedReason;
+    const fkColumns = toColumnList(relation.foreignKey);
+    const sourceColumns = relation.type === "belongsTo" ? fkColumns : toColumnList(relation.sourceKey).length > 0 ? toColumnList(relation.sourceKey) : ["id"];
+    for (const sourceColumn of sourceColumns) {
+      const directProjection = metadata.directProjectionLineage?.find(
+        (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, sourceColumn)
+      );
+      if (!directProjection) {
+        const available2 = this.virtualBindingTables.get(bindingName)?.join(", ");
+        const sourceColumnLabel = relation.type === "belongsTo" ? "FK column" : "source key column";
+        return `relation '${relationName}' ${sourceColumnLabel} '${sourceColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available2 ? ` (available columns: ${available2})` : ""}`;
+      }
     }
     const available = this.virtualBindingTables.get(bindingName)?.join(", ");
-    return `relation '${relationName}' source column '${sourceColumn}' is not available through binding '${bindingName}'${available ? ` (available columns: ${available})` : ""}`;
+    return `relation '${relationName}' source columns '${sourceColumns.join(", ")}' are not available through binding '${bindingName}'${available ? ` (available columns: ${available})` : ""}`;
+  }
+  static recursiveDirection(value) {
+    if (value === null || typeof value !== "object") return void 0;
+    const direction = value.direction;
+    if (direction === "up" || direction === "ancestors") return "up";
+    if (direction === "down" || direction === "descendants") return "down";
+    return void 0;
+  }
+  explainVirtualBindingRecursiveScalarRelationRejection(bindingName, relationName, sourceTable, metadata) {
+    const lowerRelationName = relationName.toLowerCase();
+    const pseudoColumn = this.getPseudoColumns(sourceTable).find(
+      (candidate) => candidate.ascendantKeyword?.toLowerCase() === lowerRelationName || candidate.descendantKeyword?.toLowerCase() === lowerRelationName
+    );
+    if (!pseudoColumn) return void 0;
+    const direction = pseudoColumn.ascendantKeyword?.toLowerCase() === lowerRelationName ? "up" : "down";
+    const recursiveRelations = this.getRelationsFrom(sourceTable).filter(
+      (relation) => relation.recursive !== void 0 && relation.source === relation.target && relation.source === sourceTable && _ColumnValidator.recursiveDirection(relation.recursive) === direction
+    );
+    if (recursiveRelations.length === 0) {
+      return `recursive traversal '${relationName}' is missing recursive relation metadata for direction '${direction}' (ref-#193)`;
+    }
+    for (const relation of recursiveRelations) {
+      const relationFkColumns = toColumnList(relation.foreignKey);
+      const fkColumns = relationFkColumns.length > 0 ? relationFkColumns : toColumnList(pseudoColumn.foreignKeyColumn);
+      if (fkColumns.length !== 1) {
+        return `relation '${relation.name}' self-ref FK is composite or missing; binding recursive relation columns require a single self-ref FK column (ref-#193)`;
+      }
+      const relationTargetColumns = toColumnList(relation.targetKey);
+      const targetColumns = relationTargetColumns.length > 0 ? relationTargetColumns : pseudoColumn.targetColumn !== void 0 ? [pseudoColumn.targetColumn] : [DEFAULT_RELATION_TARGET_COLUMN];
+      if (targetColumns.length !== 1) {
+        return `relation '${relation.name}' target key is composite; binding recursive relation columns require a single target key column (ref-#193)`;
+      }
+      const selfRefColumn = fkColumns[0];
+      const targetKeyColumn = targetColumns[0];
+      if (selfRefColumn === void 0 || targetKeyColumn === void 0) {
+        return `relation '${relation.name}' recursive metadata is missing a single-column seed; binding recursive relation columns require a single self-ref FK and target key column (ref-#193)`;
+      }
+      if (pseudoColumn.foreignKeyColumn !== void 0 && !_ColumnValidator.columnsMatch(
+        pseudoColumn.foreignKeyColumn,
+        selfRefColumn
+      ) || pseudoColumn.targetColumn !== void 0 && !_ColumnValidator.columnsMatch(
+        pseudoColumn.targetColumn,
+        targetKeyColumn
+      )) {
+        continue;
+      }
+      const seedColumn = direction === "up" ? selfRefColumn : targetKeyColumn;
+      const directProjection = metadata.directProjectionLineage?.find(
+        (projection) => projection.sourceTable === sourceTable && _ColumnValidator.columnsMatch(projection.sourceColumn, seedColumn)
+      );
+      if (!directProjection) {
+        const available = this.virtualBindingTables.get(bindingName)?.join(", ");
+        const seedLabel = direction === "up" ? "self-ref FK column" : "target key column";
+        return `recursive traversal '${relationName}' ${seedLabel} '${seedColumn}' is not projected as a direct source-column projection by binding '${bindingName}'${available ? ` (available columns: ${available})` : ""} (ref-#193)`;
+      }
+      return void 0;
+    }
+    return `recursive traversal '${relationName}' pseudo metadata does not match a single-column recursive self-reference (ref-#193)`;
   }
   /**
    * Convert camelCase to snake_case for column name matching.
@@ -215,6 +420,14 @@ var ColumnValidator = class _ColumnValidator {
       (c) => _ColumnValidator.columnsMatch(column, c.name)
     )?.name;
   }
+  resolvePhysicalColumnName(table, column) {
+    if (column === "*") return column;
+    const tableInfo = this.schema.getTable(table);
+    if (!tableInfo) return void 0;
+    return tableInfo.columns.find(
+      (c) => _ColumnValidator.columnsMatch(column, c.name)
+    )?.name;
+  }
   validateColumn(table, column) {
     if (column === "*") return;
     const virtualColumns = this.virtualBindingTables.get(table);
@@ -401,6 +614,17 @@ function throwBindingRelationColumn182(bindingName, relationName, reason) {
     `Query '${bindingName}' reads from an NQL binding and cannot select relation column '${relationName}' under A-full (ref-#182): ${reason}.`
   );
 }
+function bindingRelationColumnUnsupportedReason(relationName, relation) {
+  const unsupportedReason = explainUnsupportedNqlBindingIncludeHop(
+    relationName,
+    relation
+  );
+  if (unsupportedReason) return unsupportedReason;
+  if (relationCardinality(relation) !== "one") {
+    return `relation '${relationName}' is '${relation.type ?? "unknown"}'; scalar binding relation columns require every hop to be to-one (belongsTo/hasOne) (ref-#192)`;
+  }
+  return void 0;
+}
 function resolveBindingRelationFilter(ctx, bindingName, relationPath) {
   if (!isBindingTable(ctx, bindingName)) return void 0;
   const actualBindingName = bindingName;
@@ -435,19 +659,19 @@ function resolveBindingRelationColumn(ctx, bindingName, relationPath, selectedCo
   if (!isBindingTable(ctx, bindingName)) return void 0;
   const actualBindingName = bindingName;
   const relationName = relationPath.join(".");
-  if (relationPath.length !== 1) {
+  const relation = relationPath[0];
+  if (!relation) {
     throwBindingRelationColumn182(
       actualBindingName,
       relationName,
-      "multi-hop binding relation columns are not supported; the relation path must be a single source-table relation"
+      "the relation path must name a source-table relation"
     );
   }
-  const relation = relationPath[0];
-  if (!relation) {
+  if (!ctx.validator) {
     throwBindingRelationColumn182(
       actualBindingName,
       relationName,
-      "the relation path must name a source-table relation"
+      "model metadata is not available"
     );
   }
   const virtualRelation = ctx.validator?.getVirtualBindingScalarRelation(
@@ -459,10 +683,129 @@ function resolveBindingRelationColumn(ctx, bindingName, relationPath, selectedCo
       actualBindingName,
       relation
     ) ?? "model metadata is not available";
-    throwBindingRelationColumn182(actualBindingName, relation, reason);
+    throwBindingRelationColumn182(actualBindingName, relationName, reason);
+  }
+  if (relationPath.length === 1) {
+    ctx.validator.validateColumn(virtualRelation.targetTable, selectedColumn);
+    return virtualRelation;
+  }
+  const firstHop = ctx.validator.getRelation(
+    virtualRelation.sourceTable,
+    relation
+  );
+  if (!firstHop) {
+    throwBindingRelationColumn182(
+      actualBindingName,
+      relationName,
+      `relation '${relation}' is not declared on source table '${virtualRelation.sourceTable}'`
+    );
   }
-  ctx.validator?.validateColumn(virtualRelation.targetTable, selectedColumn);
-  return virtualRelation;
+  const firstHopReason = bindingRelationColumnUnsupportedReason(
+    relation,
+    firstHop
+  );
+  if (firstHopReason) {
+    throwBindingRelationColumn182(
+      actualBindingName,
+      relationName,
+      firstHopReason
+    );
+  }
+  let sourceTable = virtualRelation.targetTable;
+  const hops = [];
+  for (let i = 1; i < relationPath.length; i++) {
+    const tailRelation = relationPath[i];
+    if (!tailRelation) {
+      throwBindingRelationColumn182(
+        actualBindingName,
+        relationName,
+        `relation path segment ${i + 1} is empty (ref-#192)`
+      );
+    }
+    const resolvedTail = ctx.validator.getRelation(sourceTable, tailRelation);
+    if (!resolvedTail) {
+      throwBindingRelationColumn182(
+        actualBindingName,
+        relationName,
+        `tail relation '${tailRelation}' is not declared on table '${sourceTable}' (ref-#192)`
+      );
+    }
+    const tailReason = bindingRelationColumnUnsupportedReason(
+      tailRelation,
+      resolvedTail
+    );
+    if (tailReason) {
+      throwBindingRelationColumn182(
+        actualBindingName,
+        relationName,
+        `tail ${tailReason}`
+      );
+    }
+    const joinColumns = scalarRelationJoinColumns(resolvedTail);
+    if (!joinColumns) {
+      throwBindingRelationColumn182(
+        actualBindingName,
+        relationName,
+        `tail relation '${tailRelation}' cannot be resolved to a scalar join (ref-#192)`
+      );
+    }
+    if (joinColumns.sourceJoinColumn.length !== joinColumns.targetJoinColumn.length) {
+      throwBindingRelationColumn182(
+        actualBindingName,
+        relationName,
+        `tail relation '${tailRelation}' has mismatched join column counts (${joinColumns.sourceJoinColumn.length} source, ${joinColumns.targetJoinColumn.length} target) (ref-#179)`
+      );
+    }
+    hops.push({
+      target: resolvedTail.target,
+      fkColumn: joinColumns.sourceJoinColumn,
+      joinColumn: joinColumns.targetJoinColumn
+    });
+    sourceTable = resolvedTail.target;
+  }
+  ctx.validator.validateColumn(sourceTable, selectedColumn);
+  return {
+    ...virtualRelation,
+    relation: relationName,
+    hops
+  };
+}
+function resolveBindingRecursiveRelationColumn(ctx, bindingName, traversal, selectedColumn, maxDepth) {
+  if (!isBindingTable(ctx, bindingName)) return void 0;
+  const traversalName = traversal.toLowerCase();
+  const isRecursiveTraversal = ctx.recursiveKeywords.has(traversalName) || traversalName === "ascendant" || traversalName === "descendant";
+  const actualBindingName = bindingName;
+  if (!ctx.validator) {
+    if (!isRecursiveTraversal) return void 0;
+    throwBindingRelationColumn182(
+      actualBindingName,
+      traversalName,
+      "model metadata is not available"
+    );
+  }
+  const virtualRelation = ctx.validator.getVirtualBindingScalarRelation(
+    actualBindingName,
+    traversalName
+  );
+  if (!isRecursiveTraversal && !virtualRelation?.recursive) {
+    return void 0;
+  }
+  if (!virtualRelation?.recursive) {
+    const reason = ctx.validator.explainVirtualBindingScalarRelationRejection(
+      actualBindingName,
+      traversalName
+    );
+    throwBindingRelationColumn182(actualBindingName, traversalName, reason);
+  }
+  ctx.validator.validateColumn(virtualRelation.targetTable, selectedColumn);
+  if (maxDepth === void 0) return virtualRelation;
+  return {
+    ...virtualRelation,
+    recursive: {
+      ...virtualRelation.recursive,
+      maxDepth
+    }
+  };
 }
 function assertNoBindingRelationPath(ctx, bindingName, path) {
   if (!isBindingTable(ctx, bindingName)) return;
@@ -1099,7 +1442,12 @@ var PORTABLE_BINDING_FINAL_FUNCTIONS = /* @__PURE__ */ new Set([
   ...NQL_SELECT_AGGREGATE_FUNCTIONS,
   ...NQL_SELECT_VALUE_FUNCTIONS
 ]);
-var DEFAULT_RELATION_TARGET_COLUMN = "id";
+var UnresolvedSelectAllOutputSchemaError = class extends NqlSemanticException {
+  constructor(message) {
+    super(NqlErrorCodes.SEM_INVALID_SYNTAX, message);
+    this.name = "UnresolvedSelectAllOutputSchemaError";
+  }
+};
 function compileNestedQuery(query, ctx, fns, bindings) {
   const savedContext = {
     currentFromTable: ctx.currentFromTable,
@@ -1182,19 +1530,24 @@ function selectContainsAggregate(select) {
   );
 }
 function relationForeignKeysOnSource(relation) {
-  if (!relation || relation.type !== "belongsTo") return void 0;
-  if (typeof relation.foreignKey === "string") return [relation.foreignKey];
-  if (Array.isArray(relation.foreignKey)) return relation.foreignKey;
+  if (relation?.type !== "belongsTo") return void 0;
+  const fkColumns = toColumnList(relation.foreignKey);
+  return fkColumns.length > 0 ? fkColumns : void 0;
+}
+function recursiveDirection(recursive) {
+  if (recursive === null || typeof recursive !== "object") return void 0;
+  const direction = recursive.direction;
+  if (direction === "up" || direction === "ancestors") return "up";
+  if (direction === "down" || direction === "descendants") return "down";
   return void 0;
 }
-function relationForeignKeys(relation) {
-  if (!relation) return void 0;
-  if (typeof relation.foreignKey === "string") return [relation.foreignKey];
-  if (Array.isArray(relation.foreignKey)) return relation.foreignKey;
-  return void 0;
+function recursiveMaxDepth(recursive) {
+  if (recursive === null || typeof recursive !== "object") return void 0;
+  const maxDepth = recursive.maxDepth;
+  return typeof maxDepth === "number" && Number.isSafeInteger(maxDepth) && maxDepth > 0 ? maxDepth : void 0;
 }
-function relationCardinality(relation) {
-  return relation?.type === "hasMany" || relation?.type === "belongsToMany" ? "many" : "one";
+function pseudoColumnMatchesSelfRef(pseudoColumn, sourceTable, selfRefColumn, targetKeyColumn) {
+  return (pseudoColumn.table === void 0 || pseudoColumn.table === sourceTable) && (pseudoColumn.foreignKeyColumn === void 0 || columnsMatch(pseudoColumn.foreignKeyColumn, selfRefColumn)) && (pseudoColumn.targetColumn === void 0 || columnsMatch(pseudoColumn.targetColumn, targetKeyColumn));
 }
 function unsafeBindingRelationReason(intent, ctx, bindingDependencies) {
   if (!ctx.validator) return "model metadata is not available";
@@ -1229,13 +1582,71 @@ function findDirectSourceProjection(sourceTable, sourceColumn, directProjectionL
     (projection) => projection.sourceTable === sourceTable && columnsMatch(projection.sourceColumn, sourceColumn)
   );
 }
+function findDirectSourceProjections(sourceTable, sourceColumns, directProjectionLineage) {
+  const projections = [];
+  for (const sourceColumn of sourceColumns) {
+    const projection = findDirectSourceProjection(
+      sourceTable,
+      sourceColumn,
+      directProjectionLineage
+    );
+    if (!projection) return void 0;
+    projections.push(projection);
+  }
+  return projections;
+}
 function virtualRelationForBinding(relation, sourceTable, directProjectionLineage) {
   const fkColumns = relationForeignKeysOnSource(relation);
-  if (!relation || !fkColumns || fkColumns.length !== 1) return void 0;
-  const fkColumn = fkColumns[0];
+  if (!relation || !fkColumns) return void 0;
+  const sourceProjections = findDirectSourceProjections(
+    sourceTable,
+    fkColumns,
+    directProjectionLineage
+  );
+  if (!sourceProjections) return void 0;
+  const targetKey = toColumnList(relation.targetKey);
+  const targetColumns = targetKey.length > 0 ? targetKey : [DEFAULT_RELATION_TARGET_COLUMN];
+  if (targetColumns.length !== fkColumns.length) return void 0;
+  return {
+    relation: relation.name,
+    sourceTable,
+    targetTable: relation.target,
+    sourceColumn: sourceProjections.map(
+      (projection) => projection.outputColumn
+    ),
+    targetColumn: targetColumns,
+    hops: [],
+    cardinality: "one"
+  };
+}
+function singleResolvedColumn(columns) {
+  return columns.length === 1 ? columns[0] : void 0;
+}
+function manyToManyVirtualRelationForBinding(relation, sourceTable, directProjectionLineage) {
+  if (relation?.type !== "belongsToMany") return void 0;
+  if (typeof relation.through !== "string" || relation.through.length === 0 || relation.recursive !== void 0 || relation.source !== void 0 && relation.source === relation.target) {
+    return void 0;
+  }
+  const sourceKeys = toColumnList(relation.sourceKey);
+  const sourceColumn = singleResolvedColumn(
+    sourceKeys.length > 0 ? sourceKeys : [DEFAULT_RELATION_TARGET_COLUMN]
+  );
+  const targetKeys = toColumnList(relation.targetKey);
+  const targetColumn = singleResolvedColumn(
+    targetKeys.length > 0 ? targetKeys : [DEFAULT_RELATION_TARGET_COLUMN]
+  );
+  const throughSourceColumn = singleResolvedColumn(
+    toColumnList(relation.foreignKey)
+  );
+  const throughTargetColumn = singleResolvedColumn(
+    toColumnList(relation.otherKey)
+  );
+  if (!sourceColumn || !targetColumn || !throughSourceColumn || !throughTargetColumn) {
+    return void 0;
+  }
   const sourceProjection = findDirectSourceProjection(
     sourceTable,
-    fkColumn,
+    sourceColumn,
     directProjectionLineage
   );
   if (!sourceProjection) return void 0;
@@ -1243,34 +1654,109 @@ function virtualRelationForBinding(relation, sourceTable, directProjectionLineag
     relation: relation.name,
     sourceTable,
     targetTable: relation.target,
-    sourceColumn: sourceProjection.outputColumn,
-    targetColumn: relation.targetKey ?? DEFAULT_RELATION_TARGET_COLUMN,
-    cardinality: "one"
+    sourceColumn: [sourceProjection.outputColumn],
+    targetColumn: [targetColumn],
+    hops: [],
+    through: relation.through,
+    throughSourceColumn,
+    throughTargetColumn,
+    cardinality: "many",
+    relationType: "manyToMany"
   };
 }
-function scalarVirtualRelationForBinding(relation, sourceTable, directProjectionLineage) {
-  if (!relation) return void 0;
-  if (relation.type !== "belongsTo" && relation.type !== "hasOne") {
+function recursiveVirtualRelationForBinding(relation, sourceTable, directProjectionLineage, pseudoColumns) {
+  const direction = recursiveDirection(relation?.recursive);
+  if (!relation || !direction) return void 0;
+  if (relation.source !== relation.target || relation.source !== sourceTable) {
     return void 0;
   }
-  const fkColumns = relationForeignKeys(relation);
-  if (!fkColumns || fkColumns.length !== 1) return void 0;
-  const fkColumn = fkColumns[0];
-  const sourceJoinColumn = relation.type === "belongsTo" ? fkColumn : relation.sourceKey ?? DEFAULT_RELATION_TARGET_COLUMN;
-  const targetJoinColumn = relation.type === "belongsTo" ? relation.targetKey ?? DEFAULT_RELATION_TARGET_COLUMN : fkColumn;
+  const fkColumns = toColumnList(relation.foreignKey);
+  const targetKeys = toColumnList(relation.targetKey);
+  const pseudoColumn = pseudoColumns.find((candidate) => {
+    const candidateFkColumns = fkColumns.length > 0 ? fkColumns : toColumnList(candidate.foreignKeyColumn);
+    const candidateTargetColumns = targetKeys.length > 0 ? targetKeys : candidate.targetColumn !== void 0 ? [candidate.targetColumn] : [DEFAULT_RELATION_TARGET_COLUMN];
+    const candidateSelfRefColumn = singleResolvedColumn(candidateFkColumns);
+    const candidateTargetKeyColumn = singleResolvedColumn(
+      candidateTargetColumns
+    );
+    return candidateSelfRefColumn !== void 0 && candidateTargetKeyColumn !== void 0 && pseudoColumnMatchesSelfRef(
+      candidate,
+      sourceTable,
+      candidateSelfRefColumn,
+      candidateTargetKeyColumn
+    );
+  });
+  if (!pseudoColumn) return void 0;
+  const selfRefColumn = singleResolvedColumn(
+    fkColumns.length > 0 ? fkColumns : toColumnList(pseudoColumn.foreignKeyColumn)
+  );
+  const targetKeyColumn = singleResolvedColumn(
+    targetKeys.length > 0 ? targetKeys : pseudoColumn.targetColumn !== void 0 ? [pseudoColumn.targetColumn] : [DEFAULT_RELATION_TARGET_COLUMN]
+  );
+  if (!selfRefColumn || !targetKeyColumn) return void 0;
+  const relationName = direction === "up" ? pseudoColumn.ascendantKeyword : pseudoColumn.descendantKeyword;
+  if (!relationName) return void 0;
+  const seedColumn = direction === "up" ? selfRefColumn : targetKeyColumn;
   const sourceProjection = findDirectSourceProjection(
     sourceTable,
-    sourceJoinColumn,
+    seedColumn,
     directProjectionLineage
   );
   if (!sourceProjection) return void 0;
+  return {
+    relation: relationName.toLowerCase(),
+    sourceTable,
+    targetTable: relation.target,
+    sourceColumn: [sourceProjection.outputColumn],
+    targetColumn: [direction === "up" ? targetKeyColumn : selfRefColumn],
+    hops: [],
+    cardinality: "many",
+    relationType: relation.type,
+    recursive: {
+      direction,
+      maxDepth: recursiveMaxDepth(relation.recursive) ?? 10,
+      selfRefColumn,
+      targetKeyColumn
+    }
+  };
+}
+function scalarVirtualRelationForBinding(relation, sourceTable, directProjectionLineage) {
+  if (!relation) return void 0;
+  if (relation.type === "belongsToMany") {
+    return manyToManyVirtualRelationForBinding(
+      relation,
+      sourceTable,
+      directProjectionLineage
+    );
+  }
+  if (relation.recursive !== void 0 || relation.source !== void 0 && relation.source === relation.target) {
+    return void 0;
+  }
+  if (relation.type !== "belongsTo" && relation.type !== "hasOne" && relation.type !== "hasMany") {
+    return void 0;
+  }
+  const joinColumns = scalarRelationJoinColumns(relation);
+  if (!joinColumns) return void 0;
+  if (joinColumns.sourceJoinColumn.length !== joinColumns.targetJoinColumn.length) {
+    return void 0;
+  }
+  const sourceProjections = findDirectSourceProjections(
+    sourceTable,
+    joinColumns.sourceJoinColumn,
+    directProjectionLineage
+  );
+  if (!sourceProjections) return void 0;
   return {
     relation: relation.name,
     sourceTable,
     targetTable: relation.target,
-    sourceColumn: sourceProjection.outputColumn,
-    targetColumn: targetJoinColumn,
-    cardinality: relationCardinality(relation)
+    sourceColumn: sourceProjections.map(
+      (projection) => projection.outputColumn
+    ),
+    targetColumn: joinColumns.targetJoinColumn,
+    hops: [],
+    cardinality: relationCardinality(relation),
+    relationType: relation.type
   };
 }
 function getBindingRelationFilterMetadata(intent, ctx, outputSchema, bindingDependencies) {
@@ -1294,6 +1780,13 @@ function getBindingRelationFilterMetadata(intent, ctx, outputSchema, bindingDepe
   );
   for (const relationName of relationNames ?? []) {
     const relation = ctx.validator?.getRelation(sourceTable, relationName);
+    const recursiveRelation = recursiveVirtualRelationForBinding(
+      relation,
+      sourceTable,
+      outputSchema.directProjectionLineage ?? [],
+      ctx.validator?.getPseudoColumns(sourceTable) ?? []
+    );
+    if (recursiveRelation) scalarRelations.push(recursiveRelation);
     const virtualRelation = virtualRelationForBinding(
       relation,
       sourceTable,
@@ -1328,6 +1821,15 @@ function validateBindingFinalPath(expr, ctx, bindingName) {
   }
   const firstSegment = segments[0];
   if (ctx.pseudoColumnKeywords.has(firstSegment.toLowerCase())) {
+    if (segments.length === 2 && resolveBindingRecursiveRelationColumn(
+      ctx,
+      bindingName,
+      firstSegment,
+      segments[1],
+      expr.depthHint
+    )) {
+      return;
+    }
     assertNoBindingRelationConstruct(
       ctx,
       bindingName,
@@ -1338,6 +1840,19 @@ function validateBindingFinalPath(expr, ctx, bindingName) {
   }
   assertNoBindingRelationPath(ctx, bindingName, segments.join("."));
 }
+function resolveBindingRelationInclude(ctx, bindingName, relationPath) {
+  if (!isBindingTable(ctx, bindingName)) return void 0;
+  if (!bindingName || !ctx.validator) {
+    throw new NqlSemanticException(
+      NqlErrorCodes.SEM_INVALID_SYNTAX,
+      `Query '${bindingName ?? "<unknown>"}' reads from an NQL binding and cannot use relation include '${relationPath.join(".")}' (ref-#192): model metadata is not available.`
+    );
+  }
+  return ctx.validator.resolveVirtualBindingScalarRelationForInclude(
+    bindingName,
+    relationPath
+  );
+}
 function validateBindingFinalFunction(expr, ctx, bindingName, allowRelationFilters) {
   const fn = expr.name.toLowerCase();
   if (!PORTABLE_BINDING_FINAL_FUNCTIONS.has(fn)) {
@@ -1538,24 +2053,27 @@ function validateBindingFinalSelectClause(clause, ctx, bindingName) {
       case "star":
         break;
       case "relationStar":
-        assertNoBindingRelationConstruct(
-          ctx,
-          bindingName,
-          "select relation columns",
-          item.relation.join(".")
-        );
+        resolveBindingRelationInclude(ctx, bindingName, item.relation);
         break;
       case "expression":
         if (item.expression.type === "path" && item.expression.segments.length > 1) {
           const segments = item.expression.segments;
           const firstSegment = segments[0];
           if (ctx.pseudoColumnKeywords.has(firstSegment.toLowerCase())) {
-            assertNoBindingRelationConstruct(
+            if (segments.length !== 2 || !resolveBindingRecursiveRelationColumn(
               ctx,
               bindingName,
-              "use pseudo-column traversals",
-              firstSegment
-            );
+              firstSegment,
+              segments[1],
+              item.expression.depthHint
+            )) {
+              assertNoBindingRelationConstruct(
+                ctx,
+                bindingName,
+                "use pseudo-column traversals",
+                firstSegment
+              );
+            }
           } else {
             resolveBindingRelationColumn(
               ctx,
@@ -1779,21 +2297,38 @@ function compileQueryInternal(query, ctx, fns, bindings) {
       }
     }
   }
-  if (select && select.type === "expressions" && !isBindingSource) {
+  if (select && select.type === "expressions") {
     const relationPaths = /* @__PURE__ */ new Set();
     for (const expr of select.columns) {
       if (expr.kind === "relationColumn") {
-        relationPaths.add(expr.relation);
+        if (!isBindingSource || expr.column === "*") {
+          relationPaths.add(expr.relation);
+        }
       }
     }
     if (relationPaths.size > 0) {
-      const nestedIncludes = buildNestedIncludes(relationPaths, flatMode);
-      for (const inc of nestedIncludes) {
-        const exists = allIncludes.some(
-          (existing) => existing.relation === inc.relation
-        );
-        if (!exists) {
-          allIncludes.push(inc);
+      if (isBindingSource) {
+        for (const relation of relationPaths) {
+          resolveBindingRelationInclude(ctx, query.table, relation.split("."));
+        }
+        const nestedIncludes = buildNestedIncludes(relationPaths, flatMode);
+        for (const inc of nestedIncludes) {
+          const exists = allIncludes.some(
+            (existing) => existing.relation === inc.relation
+          );
+          if (!exists) {
+            allIncludes.push(inc);
+          }
+        }
+      } else {
+        const nestedIncludes = buildNestedIncludes(relationPaths, flatMode);
+        for (const inc of nestedIncludes) {
+          const exists = allIncludes.some(
+            (existing) => existing.relation === inc.relation
+          );
+          if (!exists) {
+            allIncludes.push(inc);
+          }
         }
       }
     }
@@ -1931,8 +2466,7 @@ function resolveSourceOutputColumns(intent, ctx, bindingName) {
   if (bindingColumns2 !== void 0) return bindingColumns2;
   const columns = ctx.validator?.getTableColumns(intent.from);
   if (columns !== void 0) return columns;
-  throw new NqlSemanticException(
-    NqlErrorCodes.SEM_INVALID_SYNTAX,
+  throw new UnresolvedSelectAllOutputSchemaError(
     `Cannot compute output schema for NQL binding '${bindingName}' from SELECT * on '${intent.from}' without a concrete table schema.`
   );
 }
@@ -2858,6 +3392,7 @@ function compileRelationFilter(expr, ctx, fns, aliasContext, outerAliases) {
     targetTable: bindingRelation.targetTable,
     sourceColumn: bindingRelation.sourceColumn,
     targetColumn: bindingRelation.targetColumn,
+    hops: bindingRelation.hops,
     ...bindingRelation.cardinality !== void 0 && {
       cardinality: bindingRelation.cardinality
     }
@@ -2967,6 +3502,20 @@ var SELECT_SCALAR_FUNCTION_NAMES = /* @__PURE__ */ new Set([
   ...NQL_SELECT_JSON_FUNCTIONS,
   ...NQL_SELECT_SCALAR_FUNCTIONS
 ]);
+function resolveBindingRelationInclude2(ctx, bindingName, relationPath) {
+  if (!isBindingTable(ctx, bindingName)) return false;
+  if (!bindingName || !ctx.validator) {
+    throw new NqlSemanticException(
+      NqlErrorCodes.SEM_INVALID_SYNTAX,
+      `Query '${bindingName ?? "<unknown>"}' reads from an NQL binding and cannot use relation include '${relationPath.join(".")}' (ref-#192): model metadata is not available.`
+    );
+  }
+  ctx.validator.resolveVirtualBindingScalarRelationForInclude(
+    bindingName,
+    relationPath
+  );
+  return true;
+}
 function validateSelectPathExpression(expr, ctx) {
   if (!ctx.currentFromTable) return;
   const { segments } = expr;
@@ -3022,12 +3571,14 @@ function compileSelectClause(clause, ctx, fns) {
     } else if (item.type === "relationStar") {
       hasExpressions = true;
       const relation = item.relation.join(".");
-      assertNoBindingRelationConstruct(
-        ctx,
-        ctx.currentFromTable,
-        "select relation columns",
-        relation
-      );
+      if (!resolveBindingRelationInclude2(ctx, ctx.currentFromTable, item.relation)) {
+        assertNoBindingRelationConstruct(
+          ctx,
+          ctx.currentFromTable,
+          "select relation columns",
+          relation
+        );
+      }
       expressions.push({
         kind: "relationColumn",
         relation,
@@ -3298,12 +3849,6 @@ function compileMultiSegmentPath(expr, item, ctx) {
   const segments = expr.segments;
   const firstSegmentLower = segments[0].toLowerCase();
   if (ctx.pseudoColumnKeywords.has(firstSegmentLower)) {
-    assertNoBindingRelationConstruct(
-      ctx,
-      ctx.currentFromTable,
-      "use pseudo-column traversals",
-      segments[0]
-    );
     const firstSegment = firstSegmentLower;
     const depthHint = expr.depthHint;
     if (depthHint !== void 0) {
@@ -3330,6 +3875,44 @@ function compileMultiSegmentPath(expr, item, ctx) {
       );
     }
     const targetColumn = segments[i];
+    const bindingRelation2 = traversals.length === 1 ? resolveBindingRecursiveRelationColumn(
+      ctx,
+      ctx.currentFromTable,
+      firstSegment,
+      targetColumn,
+      depthHint
+    ) : void 0;
+    if (bindingRelation2) {
+      const relationColumnIntent2 = {
+        kind: "relationColumn",
+        relation: bindingRelation2.relation,
+        column: targetColumn,
+        as: item.alias ?? `${bindingRelation2.relation}.${targetColumn}`
+      };
+      return markNqlTrustedRelationFilter(relationColumnIntent2, {
+        relation: bindingRelation2.relation,
+        targetTable: bindingRelation2.targetTable,
+        sourceColumn: bindingRelation2.sourceColumn,
+        targetColumn: bindingRelation2.targetColumn,
+        hops: bindingRelation2.hops,
+        selectedColumn: targetColumn,
+        ...bindingRelation2.cardinality !== void 0 && {
+          cardinality: bindingRelation2.cardinality
+        },
+        ...bindingRelation2.relationType !== void 0 && {
+          relationType: bindingRelation2.relationType
+        },
+        ...bindingRelation2.recursive !== void 0 && {
+          recursive: bindingRelation2.recursive
+        }
+      });
+    }
+    assertNoBindingRelationConstruct(
+      ctx,
+      ctx.currentFromTable,
+      "use pseudo-column traversals",
+      segments[0]
+    );
     if (ctx.currentFromTable) {
       validateColumnForTable(ctx, ctx.currentFromTable, targetColumn);
     }
@@ -3368,7 +3951,8 @@ function compileMultiSegmentPath(expr, item, ctx) {
     );
   }
   if (ctx.currentFromTable && ctx.validator) {
-    const targetTable = bindingRelation?.targetTable ?? ctx.validator.resolveRelationTarget(ctx.currentFromTable, segments[0]);
+    const lastBindingHop = bindingRelation?.hops[bindingRelation.hops.length - 1];
+    const targetTable = lastBindingHop?.target ?? bindingRelation?.targetTable ?? ctx.validator.resolveRelationTarget(ctx.currentFromTable, segments[0]);
     if (targetTable) {
       ctx.validator.validateColumn(targetTable, column);
     }
@@ -3384,9 +3968,25 @@ function compileMultiSegmentPath(expr, item, ctx) {
     targetTable: bindingRelation.targetTable,
     sourceColumn: bindingRelation.sourceColumn,
     targetColumn: bindingRelation.targetColumn,
+    hops: bindingRelation.hops,
+    ...bindingRelation.through !== void 0 && {
+      through: bindingRelation.through
+    },
+    ...bindingRelation.throughSourceColumn !== void 0 && {
+      throughSourceColumn: bindingRelation.throughSourceColumn
+    },
+    ...bindingRelation.throughTargetColumn !== void 0 && {
+      throughTargetColumn: bindingRelation.throughTargetColumn
+    },
     selectedColumn: column,
     ...bindingRelation.cardinality !== void 0 && {
       cardinality: bindingRelation.cardinality
+    },
+    ...bindingRelation.relationType !== void 0 && {
+      relationType: bindingRelation.relationType
+    },
+    ...bindingRelation.recursive !== void 0 && {
+      recursive: bindingRelation.recursive
     }
   }) : relationColumnIntent;
 }
@@ -3535,16 +4135,17 @@ function allowsInternalParams(options) {
   return internalOptions?.allowInternalParams === true;
 }
 function isUnresolvedSelectAllOutputSchemaError(error) {
-  return error instanceof NqlSemanticException && error.message.includes("from SELECT *") && error.message.includes("without a concrete table schema");
+  return error instanceof UnresolvedSelectAllOutputSchemaError;
 }
-function programSequenceStepFromResult(result, bindName, final, bindingDependencies) {
+function programSequenceStepFromResult(result, bindName, final, bindingDependencies, snapshotReadBindings) {
   if (result.query) {
     return {
       kind: "query",
       query: result.query,
       ...bindName !== void 0 && { bindName },
       final,
-      bindingDependencies
+      bindingDependencies,
+      ...bindName !== void 0 && snapshotReadBindings.has(bindName) && { snapshot: true }
     };
   }
   if (result.mutation) {
@@ -3564,6 +4165,79 @@ function stringArraysEqual(left, right) {
 function isNqlAstRecord(value) {
   return typeof value === "object" && value !== null;
 }
+function isExactPhysicalProjectionColumn(query, ctx, sourceColumn, outputColumn) {
+  const resolvedColumn = ctx.validator?.resolvePhysicalColumnName(
+    query.from,
+    sourceColumn
+  );
+  return resolvedColumn !== void 0 && sourceColumn === resolvedColumn && outputColumn === resolvedColumn;
+}
+function hasDirectPhysicalColumnProjection(query, ctx) {
+  const physicalColumns = ctx.validator?.getPhysicalTableColumns(query.from);
+  if (physicalColumns === void 0) return false;
+  const select = query.select;
+  if (!select || select.type === "all") return physicalColumns.length > 0;
+  let projectedColumnCount = 0;
+  const addStarProjection = () => {
+    projectedColumnCount += physicalColumns.length;
+    return physicalColumns.length > 0;
+  };
+  const addDirectProjection = (sourceColumn, outputColumn) => {
+    projectedColumnCount++;
+    return isExactPhysicalProjectionColumn(
+      query,
+      ctx,
+      sourceColumn,
+      outputColumn
+    );
+  };
+  if (select.type === "fields") {
+    for (const field of select.fields) {
+      if (field === "*") {
+        if (!addStarProjection()) return false;
+      } else if (!addDirectProjection(field, field)) {
+        return false;
+      }
+    }
+    return projectedColumnCount > 0;
+  }
+  if (select.type === "aggregate") return false;
+  for (const expr of select.columns) {
+    if (expr.kind === "column" && expr.column === "*") {
+      if (!addStarProjection()) return false;
+      continue;
+    }
+    if (expr.kind === "column") {
+      const outputColumn = expr.as ?? expr.column;
+      if (!addDirectProjection(expr.column, outputColumn)) return false;
+      continue;
+    }
+    if (expr.kind === "columnAlias") {
+      if (!addDirectProjection(expr.column, expr.alias)) return false;
+      continue;
+    }
+    return false;
+  }
+  return projectedColumnCount > 0;
+}
+function classifyReadBindingSnapshotShape(query, ctx, sourceWasBinding) {
+  if (sourceWasBinding) {
+    return { supported: false, reason: "a binding source" };
+  }
+  if (ctx.validator?.getPhysicalTableColumns(query.from) === void 0) {
+    return {
+      supported: false,
+      reason: `no physical model table source '${query.from}'`
+    };
+  }
+  if (!hasDirectPhysicalColumnProjection(query, ctx)) {
+    return {
+      supported: false,
+      reason: "aliased/computed/aggregate columns"
+    };
+  }
+  return { supported: true };
+}
 function addReadBindingReference(references, readBindingNames, name) {
   if (typeof name === "string" && readBindingNames.has(name)) {
     references.add(name);
@@ -3727,23 +4401,31 @@ function collectTransitiveReadBindingDependencies(directReferences, bindingDepen
   }
   return ordered;
 }
-function rejectReadBindingReferenceAcrossMutation(bindName, definitionIndex, mutationIndex, referenceIndex, statementCount) {
+function rejectReadBindingReferenceAcrossMutation(bindName, reason) {
   throw new NqlSemanticException(
     NqlErrorCodes.SEM_INVALID_SYNTAX,
-    `read binding referenced across a mutation (#186): binding '${bindName}' is defined by read-only statement ${definitionIndex + 1} of ${statementCount} and referenced by statement ${referenceIndex + 1} after mutation statement ${mutationIndex + 1}. Read-only bindings are not materialized snapshots; move the reference before the mutation or bind the mutation RETURNING result instead.`
+    `read binding referenced across a mutation: unsupported snapshot shape (#186): snapshotting currently supports only a direct single-table column projection; binding '${bindName}' has ${reason}, so it cannot be materialized - move the reference before the mutation, or bind the mutation RETURNING result.`
   );
 }
-function rejectInvalidReadBindingDependencies(statementBindingDependencies, readBindingDefinitions, lastMutationStatement, referenceIndex, statementCount) {
+function markReadBindingReferenceAcrossMutation(bindName, snapshotReadBindings, readBindingSnapshotShapes) {
+  const snapshotShape = readBindingSnapshotShapes.get(bindName);
+  if (snapshotShape?.supported !== true) {
+    rejectReadBindingReferenceAcrossMutation(
+      bindName,
+      snapshotShape?.reason ?? "an unavailable output shape"
+    );
+  }
+  snapshotReadBindings.add(bindName);
+}
+function markReadBindingDependenciesRequiringSnapshot(statementBindingDependencies, readBindingDefinitions, lastMutationStatement, snapshotReadBindings, readBindingSnapshotShapes) {
   for (const referencedBindName of statementBindingDependencies) {
     const definitionIndex = readBindingDefinitions.get(referencedBindName);
     if (definitionIndex === void 0) continue;
     if (lastMutationStatement > definitionIndex) {
-      rejectReadBindingReferenceAcrossMutation(
+      markReadBindingReferenceAcrossMutation(
         referencedBindName,
-        definitionIndex,
-        lastMutationStatement,
-        referenceIndex,
-        statementCount
+        snapshotReadBindings,
+        readBindingSnapshotShapes
       );
     }
   }
@@ -3823,6 +4505,8 @@ var NqlCompiler = class {
     const seenBindNames = /* @__PURE__ */ new Map();
     const nqlProgramSequence = [];
     const readBindingDefinitions = /* @__PURE__ */ new Map();
+    const readBindingSnapshotShapes = /* @__PURE__ */ new Map();
+    const snapshotReadBindings = /* @__PURE__ */ new Set();
     const definedBindingNames = /* @__PURE__ */ new Set();
     const bindingDependencies = /* @__PURE__ */ new Map();
     let lastMutationStatement = -1;
@@ -3848,12 +4532,12 @@ var NqlCompiler = class {
         readBindingReferences,
         bindingDependencies
       );
-      rejectInvalidReadBindingDependencies(
+      markReadBindingDependenciesRequiringSnapshot(
         statementBindingDependencies,
         readBindingDefinitions,
         lastMutationStatement,
-        i,
-        program.statements.length
+        snapshotReadBindings,
+        readBindingSnapshotShapes
       );
       lastResult = this.compileSingleStatement(stmt, bindings);
       collectCompileResultReadBindingReferences(
@@ -3865,24 +4549,35 @@ var NqlCompiler = class {
         readBindingReferences,
         bindingDependencies
       );
-      rejectInvalidReadBindingDependencies(
+      markReadBindingDependenciesRequiringSnapshot(
         statementBindingDependencies,
         readBindingDefinitions,
         lastMutationStatement,
-        i,
-        program.statements.length
+        snapshotReadBindings,
+        readBindingSnapshotShapes
       );
       if (stmt.type === "mutationPipeline") {
         lastMutationStatement = i;
       }
       if (bindName) {
         if (lastResult.query) {
+          const sourceWasBinding = definedBindingNames.has(
+            lastResult.query.from
+          );
           const outputSchema = this.registerQueryBindingOutputSchema(
             bindName,
             lastResult.query,
             bindingOutputSchemas,
             statementBindingDependencies
           );
+          readBindingSnapshotShapes.set(
+            bindName,
+            classifyReadBindingSnapshotShape(
+              lastResult.query,
+              this.ctx,
+              sourceWasBinding
+            )
+          );
           bindings.set(bindName, lastResult.query);
           if (outputSchema) {
             this.ctx.validator?.addVirtualBindingTable(
@@ -3930,7 +4625,8 @@ var NqlCompiler = class {
         lastResult,
         bindName,
         i === program.statements.length - 1,
-        statementBindingDependencies
+        statementBindingDependencies,
+        snapshotReadBindings
       );
       if (sequenceStep !== void 0) {
         nqlProgramSequence.push(sequenceStep);
@@ -3946,14 +4642,19 @@ var NqlCompiler = class {
     }
     const hasMutationBindings = mutationBindings.size > 0;
     const hasBindingOutputSchemas = bindingOutputSchemas.size > 0;
-    const hasNqlProgramSequence = nqlProgramSequence.length === program.statements.length;
+    const taggedNqlProgramSequence = nqlProgramSequence.map(
+      (step) => step.kind === "query" && step.bindName !== void 0 && snapshotReadBindings.has(step.bindName) ? { ...step, snapshot: true } : step
+    );
+    const hasNqlProgramSequence = taggedNqlProgramSequence.length === program.statements.length;
     if (bindings.size > 0) {
       return {
         ...lastResult,
         bindings,
         ...hasBindingOutputSchemas && { bindingOutputSchemas },
         ...hasMutationBindings && { mutationBindings },
-        ...hasNqlProgramSequence && { nqlProgramSequence }
+        ...hasNqlProgramSequence && {
+          nqlProgramSequence: taggedNqlProgramSequence
+        }
       };
     }
     return lastResult;