@query-farm/vgi 0.29.0 → 0.29.1

package/dist/client-entry.js

@@ -333,8 +333,8 @@ import {
   DataType,
   makeData
 } from "@query-farm/apache-arrow";
-function emptyData(field2) {
-  const type = field2.type;
+function emptyData(field) {
+  const type = field.type;
   if (DataType.isList(type)) {
     const childField = type.children[0];
     return makeData({
@@ -361,8 +361,8 @@ function emptyData(field2) {
   }
   return makeData({ type, length: 0, nullCount: 0 });
 }
-function emptyBatch(schema2) {
-  const a = schema2;
+function emptyBatch(schema) {
+  const a = schema;
   const children = a.fields.map((f) => emptyData(f));
   const structType = new Struct(a.fields);
   const data = makeData({
@@ -1369,8 +1369,8 @@ function readUnion(type, col, data, index) {
   const children = type.children;
   const typeIds = data?.typeIds;
   const tcode = typeIds ? typeIds[index] : children.length > 0 ? 0 : -1;
-  const map2 = type.typeIdToChildIndex;
-  const childIdx = map2 && map2[tcode] !== undefined ? map2[tcode] : tcode;
+  const map = type.typeIdToChildIndex;
+  const childIdx = map && map[tcode] !== undefined ? map[tcode] : tcode;
   const childField = children[childIdx];
   if (!childField)
     return { tag: null, value: null };
@@ -1432,19 +1432,19 @@ function readDictionary(type, col, data, index) {
 function columnFromArray(values, type) {
   return vectorFromArray2(values, type).data[0];
 }
-function batchFromRows(rows, schema2) {
-  const a = schema2;
+function batchFromRows(rows, schema) {
+  const a = schema;
   if (rows.length === 0) {
     return emptyBatch(a);
   }
   const columns = {};
-  for (const field2 of a.fields) {
-    columns[field2.name] = rows.map((r) => r[field2.name] ?? null);
+  for (const field of a.fields) {
+    columns[field.name] = rows.map((r) => r[field.name] ?? null);
   }
   return batchFromColumns(columns, a);
 }
-function batchFromColumns(columns, schema2, repr = "rich") {
-  const a = schema2;
+function batchFromColumns(columns, schema, repr = "rich") {
+  const a = schema;
   const numRows = a.fields.length > 0 ? columns[a.fields[0].name]?.length ?? 0 : 0;
   const children = a.fields.map((f) => {
     const values = columns[f.name];
@@ -1472,15 +1472,15 @@ function* iterRows(batch, repr = "rich") {
   for (let i = 0;i < a.numRows; i++) {
     const row = {};
     for (let fi = 0;fi < a.schema.fields.length; fi++) {
-      const field2 = a.schema.fields[fi];
-      const col = a.getChild(field2.name);
+      const field = a.schema.fields[fi];
+      const col = a.getChild(field.name);
       if (!col) {
-        row[field2.name] = null;
+        row[field.name] = null;
         continue;
       }
-      const canonical = readCanonicalValue(field2.type, col, i);
+      const canonical = readCanonicalValue(field.type, col, i);
       const codec = codecs[fi];
-      row[field2.name] = repr === "raw" ? codec.canonicalToRaw(canonical) : codec.canonicalToRich(canonical);
+      row[field.name] = repr === "raw" ? codec.canonicalToRaw(canonical) : codec.canonicalToRich(canonical);
     }
     yield row;
   }
@@ -1492,12 +1492,12 @@ function batchToScalarDict(batch) {
   if (a.numRows === 0)
     return {};
   const result = {};
-  for (const field2 of a.schema.fields) {
-    const col = a.getChild(field2.name);
+  for (const field of a.schema.fields) {
+    const col = a.getChild(field.name);
     if (col) {
-      const type = field2.type;
+      const type = field.type;
       const canonical = readCanonicalValue(type, col, 0);
-      result[field2.name] = codecFor(type).canonicalToRich(canonical);
+      result[field.name] = codecFor(type).canonicalToRich(canonical);
     }
   }
   return result;
@@ -1523,18 +1523,18 @@ function batchToSecretDict(batch) {
   if (a.numRows === 0)
     return {};
   const result = {};
-  for (const field2 of a.schema.fields) {
-    const col = a.getChild(field2.name);
+  for (const field of a.schema.fields) {
+    const col = a.getChild(field.name);
     if (col) {
-      const type = field2.type;
+      const type = field.type;
       const val = codecFor(type).canonicalToRich(readCanonicalValue(type, col, 0));
-      let key = field2.name;
+      let key = field.name;
       let scope;
-      if (field2.name.startsWith("secret_")) {
-        const secretType = field2.metadata?.get?.("secret_type");
+      if (field.name.startsWith("secret_")) {
+        const secretType = field.metadata?.get?.("secret_type");
         if (secretType) {
           key = secretType;
-          scope = field2.metadata?.get?.("scope") ?? undefined;
+          scope = field.metadata?.get?.("scope") ?? undefined;
         }
       }
       if (val && typeof val === "object" && !ArrayBuffer.isView(val)) {
@@ -1583,11 +1583,11 @@ function filterBatch(batch, mask) {
       indices.push(i);
   }
   const columns = {};
-  for (const field2 of a.schema.fields) {
-    const col = a.getChild(field2.name);
-    const type = field2.type;
+  for (const field of a.schema.fields) {
+    const col = a.getChild(field.name);
+    const type = field.type;
     const codec = codecFor(type);
-    columns[field2.name] = indices.map((i) => codec.canonicalToRich(readCanonicalValue(type, col, i)));
+    columns[field.name] = indices.map((i) => codec.canonicalToRich(readCanonicalValue(type, col, i)));
   }
   return batchFromColumns(columns, a.schema);
 }
@@ -1609,8 +1609,8 @@ function validateProjectionIds(caller, projectionIds, fieldCount) {
   }
   return projectionIds.filter((i) => i >= 0 && i < fieldCount);
 }
-function projectSchema(projectionIds, schema2) {
-  const a = schema2;
+function projectSchema(projectionIds, schema) {
+  const a = schema;
   if (!projectionIds)
     return a;
   const validIds = validateProjectionIds("projectSchema", projectionIds, a.fields.length);
@@ -1651,9 +1651,9 @@ import {
   RecordBatchStreamWriter,
   RecordBatchReader
 } from "@query-farm/apache-arrow";
-function serializeSchema(schema2) {
+function serializeSchema(schema) {
   const writer = new RecordBatchStreamWriter;
-  writer.reset(undefined, schema2);
+  writer.reset(undefined, schema);
   writer.close();
   return writer.toUint8Array(true);
 }
@@ -1721,20 +1721,20 @@ function buildTypedColumnData(values, type) {
 function buildStatisticsBatch(stats) {
   if (stats.length === 0) {
     const nullField = new Field3("0", new Null, true);
-    const unionType2 = new SparseUnion([0], [nullField]);
-    const minData2 = makeData5({
-      type: unionType2,
+    const unionType = new SparseUnion([0], [nullField]);
+    const minData = makeData5({
+      type: unionType,
       length: 0,
       typeIds: new Int8Array(0),
       children: [makeData5({ type: new Null, length: 0, nullCount: 0 })]
     });
-    const maxData2 = makeData5({
-      type: unionType2,
+    const maxData = makeData5({
+      type: unionType,
       length: 0,
       typeIds: new Int8Array(0),
       children: [makeData5({ type: new Null, length: 0, nullCount: 0 })]
     });
-    return assemble([], minData2, maxData2, [], [], [], [], [], unionType2);
+    return assemble([], minData, maxData, [], [], [], [], [], unionType);
   }
   const typeOrder = [];
   const typeIdMap = new Map;
@@ -1778,7 +1778,7 @@ function buildStatisticsBatch(stats) {
   return assemble(stats.map((s) => s.columnName), minData, maxData, stats.map((s) => s.hasNull), stats.map((s) => s.hasNotNull), stats.map((s) => s.distinctCount == null ? null : BigInt(s.distinctCount)), stats.map((s) => s.containsUnicode), stats.map((s) => s.maxStringLength == null ? null : BigInt(s.maxStringLength)), unionType);
 }
 function assemble(columnNames, minData, maxData, hasNull, hasNotNull, distinctCount, containsUnicode, maxStringLength, unionType) {
-  const schema2 = new Schema5([
+  const schema = new Schema5([
     new Field3("column_name", new Utf8, false),
     new Field3("min", unionType, true),
     new Field3("max", unionType, true),
@@ -1799,9 +1799,9 @@ function assemble(columnNames, minData, maxData, hasNull, hasNotNull, distinctCo
     buildTypedColumnData(containsUnicode, new Bool),
     buildTypedColumnData(maxStringLength, new Uint64)
   ];
-  const structType = new Struct5(schema2.fields);
+  const structType = new Struct5(schema.fields);
   const data = makeData5({ type: structType, length: n, children, nullCount: 0 });
-  return new RecordBatch6(schema2, data);
+  return new RecordBatch6(schema, data);
 }
 
 // src/arrow/impl-arrowjs/index.ts
@@ -1819,6 +1819,7 @@ var bool2 = () => bool();
 var int162 = () => int16();
 var int322 = () => int32();
 var int642 = () => int64();
+var uint642 = () => uint64();
 var float642 = () => float64();
 var utf82 = () => utf8();
 var binary2 = () => binary();
@@ -1905,47 +1906,100 @@ function unwrapScalar(val) {
   return val;
 }
 
+// src/protocol/serializers/arguments.ts
+function serializeArguments(args) {
+  const structFields = [];
+  const structValues = {};
+  for (let i = 0;i < args.positional.length; i++) {
+    const val = args.positional[i];
+    const fieldName = `positional_${i}`;
+    structFields.push(field2(fieldName, inferScalarType(val), true));
+    structValues[fieldName] = val;
+  }
+  for (const [name, val] of args.named) {
+    const fieldName = `named_${name}`;
+    structFields.push(field2(fieldName, inferScalarType(val), true));
+    structValues[fieldName] = val;
+  }
+  const structType = struct2(structFields);
+  const sch = schema2([field2("args", structType, true)]);
+  const structRow = {};
+  for (const f of structFields) {
+    let val = structValues[f.name];
+    if (isInt(f.type) && f.type.bitWidth === 64 && typeof val === "number") {
+      val = BigInt(val);
+    }
+    structRow[f.name] = val;
+  }
+  const batch = batchFromColumns({ args: [structRow] }, sch);
+  return serializeBatch(batch);
+}
+function inferScalarType(val) {
+  if (val === null || val === undefined)
+    return nullType2();
+  if (typeof val === "string")
+    return utf82();
+  if (typeof val === "boolean")
+    return bool2();
+  if (typeof val === "number")
+    return int642();
+  if (typeof val === "bigint")
+    return int642();
+  if (val instanceof Uint8Array || val instanceof ArrayBuffer)
+    return binary2();
+  return utf82();
+}
+
 // src/types.ts
 var FunctionType;
-((FunctionType2) => {
-  FunctionType2["SCALAR"] = "scalar";
-  FunctionType2["TABLE"] = "table";
-  FunctionType2["TABLE_BUFFERING"] = "table_buffering";
-  FunctionType2["AGGREGATE"] = "aggregate";
+((FunctionType) => {
+  FunctionType["SCALAR"] = "scalar";
+  FunctionType["TABLE"] = "table";
+  FunctionType["TABLE_BUFFERING"] = "table_buffering";
+  FunctionType["AGGREGATE"] = "aggregate";
 })(FunctionType ||= {});
 var FunctionStability;
-((FunctionStability2) => {
-  FunctionStability2["CONSISTENT"] = "CONSISTENT";
-  FunctionStability2["VOLATILE"] = "VOLATILE";
-  FunctionStability2["CONSISTENT_WITHIN_QUERY"] = "CONSISTENT_WITHIN_QUERY";
+((FunctionStability) => {
+  FunctionStability["CONSISTENT"] = "CONSISTENT";
+  FunctionStability["VOLATILE"] = "VOLATILE";
+  FunctionStability["CONSISTENT_WITHIN_QUERY"] = "CONSISTENT_WITHIN_QUERY";
 })(FunctionStability ||= {});
 var NullHandling;
-((NullHandling2) => {
-  NullHandling2["DEFAULT"] = "DEFAULT";
-  NullHandling2["SPECIAL"] = "SPECIAL";
+((NullHandling) => {
+  NullHandling["DEFAULT"] = "DEFAULT";
+  NullHandling["SPECIAL"] = "SPECIAL";
 })(NullHandling ||= {});
+var ArgumentMonotonicity;
+((ArgumentMonotonicity) => {
+  ArgumentMonotonicity["UNKNOWN"] = "UNKNOWN";
+  ArgumentMonotonicity["CONSTANT"] = "CONSTANT";
+  ArgumentMonotonicity["NON_DECREASING"] = "NON_DECREASING";
+  ArgumentMonotonicity["STRICTLY_INCREASING"] = "STRICTLY_INCREASING";
+  ArgumentMonotonicity["NON_INCREASING"] = "NON_INCREASING";
+  ArgumentMonotonicity["STRICTLY_DECREASING"] = "STRICTLY_DECREASING";
+})(ArgumentMonotonicity ||= {});
 var OrderPreservation;
-((OrderPreservation2) => {
-  OrderPreservation2["PRESERVES_ORDER"] = "PRESERVES_ORDER";
-  OrderPreservation2["NO_ORDER_GUARANTEE"] = "NO_ORDER_GUARANTEE";
-  OrderPreservation2["FIXED_ORDER"] = "FIXED_ORDER";
+((OrderPreservation) => {
+  OrderPreservation["PRESERVES_ORDER"] = "PRESERVES_ORDER";
+  OrderPreservation["NO_ORDER_GUARANTEE"] = "NO_ORDER_GUARANTEE";
+  OrderPreservation["FIXED_ORDER"] = "FIXED_ORDER";
 })(OrderPreservation ||= {});
 var OrderDependence;
-((OrderDependence2) => {
-  OrderDependence2["ORDER_DEPENDENT"] = "ORDER_DEPENDENT";
-  OrderDependence2["NOT_ORDER_DEPENDENT"] = "NOT_ORDER_DEPENDENT";
+((OrderDependence) => {
+  OrderDependence["ORDER_DEPENDENT"] = "ORDER_DEPENDENT";
+  OrderDependence["NOT_ORDER_DEPENDENT"] = "NOT_ORDER_DEPENDENT";
 })(OrderDependence ||= {});
 var DistinctDependence;
-((DistinctDependence2) => {
-  DistinctDependence2["DISTINCT_DEPENDENT"] = "DISTINCT_DEPENDENT";
-  DistinctDependence2["NOT_DISTINCT_DEPENDENT"] = "NOT_DISTINCT_DEPENDENT";
+((DistinctDependence) => {
+  DistinctDependence["DISTINCT_DEPENDENT"] = "DISTINCT_DEPENDENT";
+  DistinctDependence["NOT_DISTINCT_DEPENDENT"] = "NOT_DISTINCT_DEPENDENT";
 })(DistinctDependence ||= {});
 var TableInOutPhase;
-((TableInOutPhase2) => {
-  TableInOutPhase2["INPUT"] = "INPUT";
-  TableInOutPhase2["FINALIZE"] = "FINALIZE";
-  TableInOutPhase2["TABLE_BUFFERING"] = "TABLE_BUFFERING";
-  TableInOutPhase2["TABLE_BUFFERING_FINALIZE"] = "TABLE_BUFFERING_FINALIZE";
+((TableInOutPhase) => {
+  TableInOutPhase["INPUT"] = "INPUT";
+  TableInOutPhase["FINALIZE"] = "FINALIZE";
+  TableInOutPhase["TABLE_BUFFERING"] = "TABLE_BUFFERING";
+  TableInOutPhase["TABLE_BUFFERING_FINALIZE"] = "TABLE_BUFFERING_FINALIZE";
 })(TableInOutPhase ||= {});
 var VGI_ARG_KEY = "vgi_arg";
 var VGI_ARG_NAMED = "named";
@@ -1985,60 +2039,16 @@ function toUint8Array2(val) {
   }
   return result;
 }
-function buildSingleRowBatch(schema3, values) {
+function buildSingleRowBatch(schema, values) {
   const cols = {};
-  for (const f of schema3.fields) {
+  for (const f of schema.fields) {
     let val = values[f.name];
     if (isInt(f.type) && f.type.bitWidth === 64 && typeof val === "number") {
       val = BigInt(val);
     }
     cols[f.name] = [val];
   }
-  return batchFromColumns(cols, schema3);
-}
-
-// src/protocol/serializers/arguments.ts
-function serializeArguments(args) {
-  const structFields = [];
-  const structValues = {};
-  for (let i = 0;i < args.positional.length; i++) {
-    const val = args.positional[i];
-    const fieldName = `positional_${i}`;
-    structFields.push(field2(fieldName, inferScalarType(val), true));
-    structValues[fieldName] = val;
-  }
-  for (const [name, val] of args.named) {
-    const fieldName = `named_${name}`;
-    structFields.push(field2(fieldName, inferScalarType(val), true));
-    structValues[fieldName] = val;
-  }
-  const structType = struct2(structFields);
-  const sch = schema2([field2("args", structType, true)]);
-  const structRow = {};
-  for (const f of structFields) {
-    let val = structValues[f.name];
-    if (isInt(f.type) && f.type.bitWidth === 64 && typeof val === "number") {
-      val = BigInt(val);
-    }
-    structRow[f.name] = val;
-  }
-  const batch = batchFromColumns({ args: [structRow] }, sch);
-  return serializeBatch(batch);
-}
-function inferScalarType(val) {
-  if (val === null || val === undefined)
-    return nullType2();
-  if (typeof val === "string")
-    return utf82();
-  if (typeof val === "boolean")
-    return bool2();
-  if (typeof val === "number")
-    return int642();
-  if (typeof val === "bigint")
-    return int642();
-  if (val instanceof Uint8Array || val instanceof ArrayBuffer)
-    return binary2();
-  return utf82();
+  return batchFromColumns(cols, schema);
 }
 
 // src/protocol/serializers/bind.ts
@@ -2065,7 +2075,8 @@ var BIND_REQUEST_SCHEMA = schema2([
   field2("at_value", utf82(), true),
   field2("copy_from", COPY_FROM_STRUCT_TYPE, true),
   field2("copy_to", COPY_TO_STRUCT_TYPE, true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true),
+  field2("argument_names", list2(field2("item", utf82(), true)), true)
 ]);
 function serializeBindRequest(req) {
   return buildSingleRowBatch(BIND_REQUEST_SCHEMA, {
@@ -2086,7 +2097,8 @@ function serializeBindRequest(req) {
       expected_schema: serializeSchema(req.copy_from.expected_schema)
     } : null,
     copy_to: req.copy_to ? { format: req.copy_to.format, file_path: req.copy_to.file_path } : null,
-    schema_name: req.schema_name ?? null
+    schema_path: req.schema_path ?? null,
+    argument_names: req.argument_names ?? null
   });
 }
 function deserializeBindResponse(params) {
@@ -2221,21 +2233,26 @@ class NoCatalogError extends VgiError {
   }
 }
 
+// src/schema-path.ts
+function normalizeSchemaPath(path) {
+  return typeof path === "string" ? [path] : Array.from(path, String);
+}
+
 // src/codec/asd.ts
-function encodeASD(schema3, obj) {
-  return serializeBatch(batchFromRows([obj], schema3));
+function encodeASD(schema, obj) {
+  return serializeBatch(batchFromRows([obj], schema));
 }
-function decodeASD(schema3, bytes) {
+function decodeASD(schema, bytes) {
   const batch = deserializeBatch(bytes);
   if (batch.numRows === 0) {
-    const names = schema3.fields.map((f) => f.name).join(",");
+    const names = schema.fields.map((f) => f.name).join(",");
     throw new Error(`decodeASD: empty batch (expected 1 row for ${names})`);
   }
   const out = {};
-  for (const field3 of schema3.fields) {
-    const col = batch.getChild(field3.name);
+  for (const field of schema.fields) {
+    const col = batch.getChild(field.name);
     const raw = col ? col.get(0) : null;
-    out[field3.name] = normalizeValue(raw, field3.type);
+    out[field.name] = normalizeValue(raw, field.type);
   }
   return out;
 }
@@ -2320,14 +2337,14 @@ var SchemaInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("estimated_object_count", map2(field2("key", utf82(), false), field2("value", int642(), true), false), true)
 ]);
 var TableInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("columns", binary2(), false),
   field2("not_null_constraints", list2(field2("item", int322(), true)), false),
   field2("unique_constraints", list2(field2("item", list2(field2("item", int322(), true)), true)), false),
@@ -2353,7 +2370,7 @@ var ViewInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("definition", utf82(), false),
   field2("column_comments", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false)
 ]);
@@ -2361,12 +2378,14 @@ var FunctionInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("function_type", dictionary2(utf82(), int162()), false),
   field2("arguments", binary2(), false),
   field2("output_schema", binary2(), false),
+  field2("parameter_default_values", binary2(), true),
   field2("stability", dictionary2(utf82(), int162()), true),
   field2("null_handling", dictionary2(utf82(), int162()), true),
+  field2("argument_monotonicity", list2(field2("item", utf82(), true)), true),
   field2("description", utf82(), false),
   field2("examples", list2(field2("item", struct2([field2("sql", utf82(), false), field2("description", utf82(), false), field2("expected_output", utf82(), true)]), true)), false),
   field2("categories", list2(field2("item", utf82(), true)), false),
@@ -2374,7 +2393,10 @@ var FunctionInfoSchema = schema2([
   field2("filter_pushdown", bool2(), true),
   field2("sampling_pushdown", bool2(), true),
   field2("late_materialization", bool2(), true),
-  field2("supported_expression_filters", list2(field2("item", utf82(), true)), false),
+  field2("filter_semantic_profiles", list2(field2("item", utf82(), true)), false),
+  field2("additional_filter_functions", list2(field2("item", struct2([field2("namespace", utf82(), false), field2("name", utf82(), false), field2("version", uint642(), false)]), true)), false),
+  field2("runtime_filter_algorithms", list2(field2("item", struct2([field2("namespace", utf82(), false), field2("name", utf82(), false), field2("version", uint642(), false)]), true)), false),
+  field2("filter_evaluation_contexts", list2(field2("item", struct2([field2("profile", utf82(), false), field2("provider_fingerprint", utf82(), true)]), true)), false),
   field2("order_preservation", dictionary2(utf82(), int162()), true),
   field2("max_workers", int322(), true),
   field2("supports_batch_index", bool2(), false),
@@ -2399,7 +2421,7 @@ var MacroInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("macro_type", dictionary2(utf82(), int162()), false),
   field2("parameters", list2(field2("item", utf82(), true)), false),
   field2("parameter_default_values", binary2(), true),
@@ -2410,7 +2432,7 @@ var IndexInfoSchema = schema2([
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
   field2("name", utf82(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("table_name", utf82(), false),
   field2("index_type", utf82(), false),
   field2("constraint_type", dictionary2(utf82(), int162()), false),
@@ -2430,7 +2452,8 @@ var CopyFromFormatInfoSchema = schema2([
 var ScanFunctionResultSchema = schema2([
   field2("function_name", utf82(), false),
   field2("arguments", binary2(), false),
-  field2("required_extensions", list2(field2("item", utf82(), true)), false)
+  field2("required_extensions", list2(field2("item", utf82(), true)), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var ScanBranchesResultSchema = schema2([
   field2("branches", list2(field2("item", binary2(), true)), false),
@@ -2442,11 +2465,12 @@ var ScanBranchSchema = schema2([
   field2("branch_filter", utf82(), true),
   field2("writable", bool2(), false),
   field2("source_catalog", utf82(), true),
-  field2("source_schema", utf82(), true),
+  field2("source_schema_path", list2(field2("item", utf82(), true)), true),
   field2("source_table", utf82(), true),
   field2("format_name", utf82(), true),
   field2("format_locations", list2(field2("item", utf82(), true)), true),
-  field2("format_options", binary2(), true)
+  field2("format_options", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var ScanSplitSchema = schema2([
   field2("payload", binary2(), false),
@@ -2469,6 +2493,12 @@ var AttachCatalogInfoSchema = schema2([
   field2("required", bool2(), false),
   field2("secret_ref", utf82(), false)
 ]);
+var ForeignKeyInfoSchema = schema2([
+  field2("fk_columns", list2(field2("item", utf82(), true)), false),
+  field2("pk_columns", list2(field2("item", utf82(), true)), false),
+  field2("referenced_table", utf82(), false),
+  field2("referenced_schema_path", list2(field2("item", utf82(), true)), false)
+]);
 var AggregateBindRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("arguments", binary2(), false),
@@ -2476,21 +2506,22 @@ var AggregateBindRequestSchema = schema2([
   field2("settings", binary2(), true),
   field2("secrets", binary2(), true),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true),
+  field2("argument_names", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateCombineRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("merge_batch", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateDestructorRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("group_ids_batch", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateFinalizeRequestSchema = schema2([
   field2("function_name", utf82(), false),
@@ -2498,14 +2529,81 @@ var AggregateFinalizeRequestSchema = schema2([
   field2("group_ids_batch", binary2(), false),
   field2("output_schema", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateStreamingChunkRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("input_batch", binary2(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateStreamingCloseRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateStreamingOpenRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("arguments", binary2(), false),
+  field2("input_schema", binary2(), false),
+  field2("partition_key_count", int642(), false),
+  field2("order_key_count", int642(), false),
+  field2("output_schema", binary2(), false),
+  field2("settings", binary2(), true),
+  field2("secrets", binary2(), true),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var AggregateUpdateRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("input_batch", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowBatchRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("row_idx", int642(), false),
+  field2("count", int642(), false),
+  field2("frames_per_row", list2(field2("item", int642(), true)), false),
+  field2("frame_starts", list2(field2("item", int642(), true)), false),
+  field2("frame_ends", list2(field2("item", int642(), true)), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowDestructorRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowInitRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("row_count", int642(), false),
+  field2("partition_batch", binary2(), false),
+  field2("output_schema", binary2(), false),
+  field2("filter_mask", binary2(), false),
+  field2("frame_stats", binary2(), false),
+  field2("all_valid", binary2(), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
+]);
+var AggregateWindowRequestSchema = schema2([
+  field2("function_name", utf82(), false),
+  field2("execution_id", binary2(), false),
+  field2("partition_id", int642(), false),
+  field2("rid", int642(), false),
+  field2("frame_starts", list2(field2("item", int642(), true)), false),
+  field2("frame_ends", list2(field2("item", int642(), true)), false),
+  field2("attach_opaque_data", binary2(), true),
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var BindRequestSchema = schema2([
   field2("function_name", utf82(), false),
@@ -2521,7 +2619,8 @@ var BindRequestSchema = schema2([
   field2("at_value", utf82(), true),
   field2("copy_from", struct2([field2("format", utf82(), false), field2("file_path", utf82(), false), field2("expected_schema", binary2(), false)]), true),
   field2("copy_to", struct2([field2("format", utf82(), false), field2("file_path", utf82(), false)]), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true),
+  field2("argument_names", list2(field2("item", utf82(), true)), true)
 ]);
 var CatalogAttachRequestSchema = schema2([
   field2("name", utf82(), false),
@@ -2530,6 +2629,18 @@ var CatalogAttachRequestSchema = schema2([
   field2("implementation_version", utf82(), true),
   field2("client_capabilities", binary2(), true)
 ]);
+var CatalogCreateRequestSchema = schema2([
+  field2("name", utf82(), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("options", binary2(), true)
+]);
+var ClientCapabilitiesSchema = schema2([
+  field2("engine", utf82(), false),
+  field2("native_formats", list2(field2("item", utf82(), true)), false),
+  field2("catalogs", list2(field2("item", utf82(), true)), false),
+  field2("can_stream", bool2(), false),
+  field2("filter_encodings", list2(field2("item", utf82(), true)), false)
+]);
 var CopyFromContextSchema = schema2([
   field2("format", utf82(), false),
   field2("file_path", utf82(), false),
@@ -2544,6 +2655,18 @@ var GlobalInitResponseSchema = schema2([
   field2("opaque_data", binary2(), true),
   field2("max_workers", int642(), false)
 ]);
+var IndexCreateRequestSchema = schema2([
+  field2("attach_opaque_data", binary2(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
+  field2("name", utf82(), false),
+  field2("table_name", utf82(), false),
+  field2("index_type", utf82(), false),
+  field2("constraint_type", dictionary2(utf82(), int162()), false),
+  field2("expressions", list2(field2("item", utf82(), true)), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("options", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), false),
+  field2("transaction_opaque_data", binary2(), true)
+]);
 var InitRequestSchema = schema2([
   field2("bind_call", binary2(), false),
   field2("output_schema", binary2(), false),
@@ -2565,20 +2688,45 @@ var InitRequestSchema = schema2([
   field2("tablesample_percentage", float642(), true),
   field2("tablesample_seed", int642(), true)
 ]);
+var MacroCreateRequestSchema = schema2([
+  field2("attach_opaque_data", binary2(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
+  field2("name", utf82(), false),
+  field2("macro_type", dictionary2(utf82(), int162()), false),
+  field2("parameters", list2(field2("item", utf82(), true)), false),
+  field2("definition", utf82(), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("parameter_default_values", binary2(), true),
+  field2("arguments_schema", binary2(), true),
+  field2("transaction_opaque_data", binary2(), true)
+]);
+var TableCreateRequestSchema = schema2([
+  field2("attach_opaque_data", binary2(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
+  field2("name", utf82(), false),
+  field2("columns", binary2(), false),
+  field2("on_conflict", dictionary2(utf82(), int162()), false),
+  field2("not_null_constraints", list2(field2("item", int322(), true)), false),
+  field2("unique_constraints", list2(field2("item", list2(field2("item", int322(), true)), true)), false),
+  field2("check_constraints", list2(field2("item", utf82(), true)), false),
+  field2("primary_key_constraints", list2(field2("item", list2(field2("item", int322(), true)), true)), false),
+  field2("foreign_key_constraints", list2(field2("item", binary2(), true)), false),
+  field2("transaction_opaque_data", binary2(), true)
+]);
 var TableBufferingCombineRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("state_ids", list2(field2("item", binary2(), true)), false),
   field2("attach_opaque_data", binary2(), true),
   field2("transaction_id", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var TableBufferingDestructorRequestSchema = schema2([
   field2("function_name", utf82(), false),
   field2("execution_id", binary2(), false),
   field2("attach_opaque_data", binary2(), true),
   field2("transaction_id", binary2(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var TableBufferingProcessRequestSchema = schema2([
   field2("function_name", utf82(), false),
@@ -2587,12 +2735,17 @@ var TableBufferingProcessRequestSchema = schema2([
   field2("attach_opaque_data", binary2(), true),
   field2("transaction_id", binary2(), true),
   field2("batch_index", int642(), true),
-  field2("schema_name", utf82(), true)
+  field2("schema_path", list2(field2("item", utf82(), true)), true)
 ]);
 var TableFunctionCardinalityRequestSchema = schema2([
   field2("bind_call", binary2(), false),
   field2("bind_opaque_data", binary2(), true)
 ]);
+var TableFunctionDynamicToStringRequestSchema = schema2([
+  field2("bind_call", binary2(), false),
+  field2("bind_opaque_data", binary2(), true),
+  field2("global_execution_id", binary2(), false)
+]);
 var TableFunctionPlanRequestSchema = schema2([
   field2("bind_call", binary2(), false),
   field2("bind_opaque_data", binary2(), true),
@@ -2615,6 +2768,10 @@ var TableFunctionPlanRequestSchema = schema2([
   field2("tablesample_percentage", float642(), true),
   field2("tablesample_seed", int642(), true)
 ]);
+var TableFunctionStatisticsRequestSchema = schema2([
+  field2("bind_call", binary2(), false),
+  field2("bind_opaque_data", binary2(), true)
+]);
 var AggregateBindResultSchema = schema2([
   field2("output_schema", binary2(), false),
   field2("execution_id", binary2(), false)
@@ -2805,7 +2962,7 @@ var CatalogIndexCreateParamsSchema = schema2([
 ]);
 var CatalogIndexDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
@@ -2813,7 +2970,7 @@ var CatalogIndexDropParamsSchema = schema2([
 ]);
 var CatalogIndexGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
@@ -2822,47 +2979,47 @@ var CatalogMacroCreateParamsSchema = schema2([
 ]);
 var CatalogMacroDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogMacroGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsFunctionsParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("type", dictionary2(utf82(), int162()), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsIndexesParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsMacrosParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("type", dictionary2(utf82(), int162()), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsTablesParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaContentsViewsParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaCreateParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("on_conflict", dictionary2(utf82(), int162()), false),
   field2("comment", utf82(), true),
   field2("tags", map2(field2("key", utf82(), false), field2("value", utf82(), true), false), true),
@@ -2870,14 +3027,14 @@ var CatalogSchemaCreateParamsSchema = schema2([
 ]);
 var CatalogSchemaDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemaGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("name", utf82(), false),
+  field2("path", list2(field2("item", utf82(), true)), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogSchemasParamsSchema = schema2([
@@ -2886,7 +3043,7 @@ var CatalogSchemasParamsSchema = schema2([
 ]);
 var CatalogTableColumnAddParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_definition", binary2(), false),
   field2("ignore_not_found", bool2(), false),
@@ -2895,7 +3052,7 @@ var CatalogTableColumnAddParamsSchema = schema2([
 ]);
 var CatalogTableColumnCommentSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("comment", utf82(), true),
@@ -2904,7 +3061,7 @@ var CatalogTableColumnCommentSetParamsSchema = schema2([
 ]);
 var CatalogTableColumnDefaultDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -2912,7 +3069,7 @@ var CatalogTableColumnDefaultDropParamsSchema = schema2([
 ]);
 var CatalogTableColumnDefaultSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("expression", utf82(), false),
@@ -2921,7 +3078,7 @@ var CatalogTableColumnDefaultSetParamsSchema = schema2([
 ]);
 var CatalogTableColumnDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -2931,7 +3088,7 @@ var CatalogTableColumnDropParamsSchema = schema2([
 ]);
 var CatalogTableColumnRenameParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("new_column_name", utf82(), false),
@@ -2940,13 +3097,13 @@ var CatalogTableColumnRenameParamsSchema = schema2([
 ]);
 var CatalogTableColumnStatisticsGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogTableColumnTypeChangeParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_definition", binary2(), false),
   field2("expression", utf82(), true),
@@ -2955,7 +3112,7 @@ var CatalogTableColumnTypeChangeParamsSchema = schema2([
 ]);
 var CatalogTableCommentSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("comment", utf82(), true),
   field2("ignore_not_found", bool2(), false),
@@ -2966,13 +3123,13 @@ var CatalogTableCreateParamsSchema = schema2([
 ]);
 var CatalogTableDeleteFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogTableDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
@@ -2980,7 +3137,7 @@ var CatalogTableDropParamsSchema = schema2([
 ]);
 var CatalogTableGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("at_unit", utf82(), true),
   field2("at_value", utf82(), true),
@@ -2988,14 +3145,14 @@ var CatalogTableGetParamsSchema = schema2([
 ]);
 var CatalogTableInsertFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true),
   field2("writable_branch_function_name", utf82(), true)
 ]);
 var CatalogTableNotNullDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3003,7 +3160,7 @@ var CatalogTableNotNullDropParamsSchema = schema2([
 ]);
 var CatalogTableNotNullSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("column_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3011,7 +3168,7 @@ var CatalogTableNotNullSetParamsSchema = schema2([
 ]);
 var CatalogTableRenameParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("new_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3019,7 +3176,7 @@ var CatalogTableRenameParamsSchema = schema2([
 ]);
 var CatalogTableScanBranchesGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("at_unit", utf82(), true),
   field2("at_value", utf82(), true),
@@ -3027,7 +3184,7 @@ var CatalogTableScanBranchesGetParamsSchema = schema2([
 ]);
 var CatalogTableScanFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("at_unit", utf82(), true),
   field2("at_value", utf82(), true),
@@ -3035,7 +3192,7 @@ var CatalogTableScanFunctionGetParamsSchema = schema2([
 ]);
 var CatalogTableUpdateFunctionGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
@@ -3056,7 +3213,7 @@ var CatalogVersionParamsSchema = schema2([
 ]);
 var CatalogViewCommentSetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("comment", utf82(), true),
   field2("ignore_not_found", bool2(), false),
@@ -3064,7 +3221,7 @@ var CatalogViewCommentSetParamsSchema = schema2([
 ]);
 var CatalogViewCreateParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("definition", utf82(), false),
   field2("on_conflict", dictionary2(utf82(), int162()), false),
@@ -3072,7 +3229,7 @@ var CatalogViewCreateParamsSchema = schema2([
 ]);
 var CatalogViewDropParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
   field2("cascade", bool2(), false),
@@ -3080,13 +3237,13 @@ var CatalogViewDropParamsSchema = schema2([
 ]);
 var CatalogViewGetParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("transaction_opaque_data", binary2(), true)
 ]);
 var CatalogViewRenameParamsSchema = schema2([
   field2("attach_opaque_data", binary2(), false),
-  field2("schema_name", utf82(), false),
+  field2("schema_path", list2(field2("item", utf82(), true)), false),
   field2("name", utf82(), false),
   field2("new_name", utf82(), false),
   field2("ignore_not_found", bool2(), false),
@@ -3136,16 +3293,16 @@ function decodeScanFunctionResult(inner) {
   const namedArguments = {};
   if (argsBytes != null) {
     const batch = deserializeBatch(toUint8Array(argsBytes));
-    for (const field3 of batch.schema.fields) {
-      const col = batch.getChild(field3.name);
+    for (const field of batch.schema.fields) {
+      const col = batch.getChild(field.name);
       const value = col ? col.get(0) : null;
-      if (field3.name.startsWith("arg_")) {
-        const idx = parseInt(field3.name.slice(4), 10);
+      if (field.name.startsWith("arg_")) {
+        const idx = parseInt(field.name.slice(4), 10);
         while (positionalArguments.length <= idx)
           positionalArguments.push(null);
         positionalArguments[idx] = value;
       } else {
-        namedArguments[field3.name] = value;
+        namedArguments[field.name] = value;
       }
     }
   }
@@ -3155,7 +3312,8 @@ function decodeScanFunctionResult(inner) {
     functionName: String(inner.function_name ?? ""),
     positionalArguments,
     namedArguments,
-    requiredExtensions
+    requiredExtensions,
+    schemaPath: inner.schema_path == null ? null : (Array.isArray(inner.schema_path) ? inner.schema_path : [...inner.schema_path]).filter((value) => value != null).map(String)
   };
 }
 
@@ -3202,8 +3360,8 @@ function serializeAttachOptions(options) {
     fields.push(field2(key, type, true));
     columns[key] = [value];
   }
-  const schema3 = schema2(fields);
-  const batch = batchFromColumns(columns, schema3);
+  const schema = schema2(fields);
+  const batch = batchFromColumns(columns, schema);
   return serializeBatch(batch);
 }
 
@@ -3303,6 +3461,19 @@ class VgiClient {
     this.rpc = wrapRpcWithErrorEnrichment(rpc);
     this.defaultAttachOpaqueData = options?.attachOpaqueData ?? null;
   }
+  static async fromIroh(endpoint, options = {}, clientOptions, connector) {
+    if (!/^(iroh|httpi):\/\//.test(endpoint)) {
+      throw new TypeError("VgiClient.fromIroh requires an iroh:// or httpi:// endpoint");
+    }
+    let selected = connector;
+    if (!selected) {
+      const rpc = await import("@query-farm/vgi-rpc");
+      selected = endpoint.startsWith("iroh://") ? rpc.irohConnect : rpc.httpiConnect;
+    }
+    if (!selected)
+      throw new TypeError("no Iroh connector is available in this runtime");
+    return new VgiClient(await selected(endpoint, options), clientOptions);
+  }
   async _doBind(functionName, functionType, args, inputSchema, settings, secrets, transactionOpaqueData, attachOpaqueData = null, onBind) {
     const request = {
       function_name: functionName,
@@ -3382,7 +3553,7 @@ class VgiClient {
     const inputIter = toAsyncIterator(opts.input);
     const first = await inputIter.next();
     if (first.done) {
-      throw new VgiClientError(`scalarFunction(${opts.functionName}): input iterator yielded no batches; ` + `at least one batch is required to determine the input schema`);
+      throw new VgiClientError(`scalarFunction(${opts.functionName}): input iterator yielded no batches; at least one batch is required to determine the input schema`);
     }
     const firstBatch = first.value;
     const inputSchema = firstBatch.schema;
@@ -3406,7 +3577,7 @@ class VgiClient {
     const inputIter = toAsyncIterator(opts.input);
     const first = await inputIter.next();
     if (first.done) {
-      throw new VgiClientError(`scalarFunction(${opts.functionName}): input iterator yielded no batches; ` + `at least one batch is required to determine the input schema`);
+      throw new VgiClientError(`scalarFunction(${opts.functionName}): input iterator yielded no batches; at least one batch is required to determine the input schema`);
     }
     const firstBatch = first.value;
     const inputSchema = firstBatch.schema;
@@ -3431,7 +3602,7 @@ class VgiClient {
     const inputIter = toAsyncIterator(opts.input);
     const first = await inputIter.next();
     if (first.done) {
-      throw new VgiClientError(`tableInOutFunction(${opts.functionName}): input iterator yielded no batches; ` + `at least one batch is required to determine the input schema`);
+      throw new VgiClientError(`tableInOutFunction(${opts.functionName}): input iterator yielded no batches; at least one batch is required to determine the input schema`);
     }
     const firstBatch = first.value;
     const inputSchema = firstBatch.schema;
@@ -3479,7 +3650,7 @@ class VgiClient {
     const inputIter = toAsyncIterator(opts.input);
     const first = await inputIter.next();
     if (first.done) {
-      throw new VgiClientError(`tableInOutFunction(${opts.functionName}): input iterator yielded no batches; ` + `at least one batch is required to determine the input schema`);
+      throw new VgiClientError(`tableInOutFunction(${opts.functionName}): input iterator yielded no batches; at least one batch is required to determine the input schema`);
     }
     const firstBatch = first.value;
     const inputSchema = firstBatch.schema;
@@ -3564,18 +3735,20 @@ class VgiClient {
     } else {
       wireOptions = serializeAttachOptions(opts?.options);
     }
-    const schema3 = schema2([
+    const schema = schema2([
       field2("name", utf82(), false),
       field2("options", binary2(), true),
       field2("data_version_spec", utf82(), true),
-      field2("implementation_version", utf82(), true)
+      field2("implementation_version", utf82(), true),
+      field2("client_capabilities", binary2(), true)
     ]);
     const innerBatch = batchFromColumns({
       name: [name],
       options: [wireOptions],
       data_version_spec: [opts?.dataVersionSpec ?? null],
-      implementation_version: [opts?.implementationVersion ?? null]
-    }, schema3);
+      implementation_version: [opts?.implementationVersion ?? null],
+      client_capabilities: [opts?.clientCapabilities ? encodeASD(ClientCapabilitiesSchema, opts.clientCapabilities) : null]
+    }, schema);
     const result = await this.rpc.call("catalog_attach", wrapRequest(innerBatch));
     if (!result)
       throw new VgiClientError("catalog_attach returned null");
@@ -3672,10 +3845,10 @@ class VgiClient {
     const inner = unwrapResult(result);
     return deserializeInfoList(inner.items, decodeSchemaInfo);
   }
-  async schemaGet(attachOpaqueData, name, transactionOpaqueData) {
+  async schemaGet(attachOpaqueData, path, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_schema_get", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       transaction_opaque_data: transactionOpaqueData ?? null
     });
     if (!result)
@@ -3684,30 +3857,30 @@ class VgiClient {
     const items = deserializeInfoList(inner.items, decodeSchemaInfo);
     return items.length > 0 ? items[0] : null;
   }
-  async schemaCreate(attachOpaqueData, name, opts) {
+  async schemaCreate(attachOpaqueData, path, opts) {
     const tagsMap = opts?.tags ? new Map(Object.entries(opts.tags)) : null;
     await this.rpc.call("catalog_schema_create", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       on_conflict: opts?.onConflict ?? "error",
       comment: opts?.comment ?? null,
       tags: tagsMap,
       transaction_opaque_data: opts?.transactionOpaqueData ?? null
     });
   }
-  async schemaDrop(attachOpaqueData, name, ignoreNotFound, cascade, transactionOpaqueData) {
+  async schemaDrop(attachOpaqueData, path, ignoreNotFound, cascade, transactionOpaqueData) {
     await this.rpc.call("catalog_schema_drop", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       ignore_not_found: ignoreNotFound ?? false,
       cascade: cascade ?? false,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async schemaContentsTables(attachOpaqueData, name, transactionOpaqueData) {
+  async schemaContentsTables(attachOpaqueData, path, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_schema_contents_tables", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       transaction_opaque_data: transactionOpaqueData ?? null
     });
     if (!result)
@@ -3715,10 +3888,10 @@ class VgiClient {
     const inner = unwrapResult(result);
     return deserializeInfoList(inner.items, decodeTableInfo);
   }
-  async schemaContentsViews(attachOpaqueData, name, transactionOpaqueData) {
+  async schemaContentsViews(attachOpaqueData, path, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_schema_contents_views", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       transaction_opaque_data: transactionOpaqueData ?? null
     });
     if (!result)
@@ -3726,10 +3899,10 @@ class VgiClient {
     const inner = unwrapResult(result);
     return deserializeInfoList(inner.items, decodeViewInfo);
   }
-  async schemaContentsFunctions(attachOpaqueData, name, type, transactionOpaqueData) {
+  async schemaContentsFunctions(attachOpaqueData, path, type, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_schema_contents_functions", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       type,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
@@ -3738,10 +3911,10 @@ class VgiClient {
     const inner = unwrapResult(result);
     return deserializeInfoList(inner.items, decodeFunctionInfo);
   }
-  async tableGet(attachOpaqueData, schemaName, name, transactionOpaqueData) {
+  async tableGet(attachOpaqueData, schemaPath, name, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_table_get", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
@@ -3751,10 +3924,10 @@ class VgiClient {
     const items = deserializeInfoList(inner.items, decodeTableInfo);
     return items.length > 0 ? items[0] : null;
   }
-  async tableCreate(attachOpaqueData, schemaName, name, columns, onConflict, notNullConstraints, uniqueConstraints, checkConstraints, transactionOpaqueData) {
+  async tableCreate(attachOpaqueData, schemaPath, name, columns, onConflict, notNullConstraints, uniqueConstraints, checkConstraints, transactionOpaqueData) {
     await this.rpc.call("catalog_table_create", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       columns,
       on_conflict: onConflict,
@@ -3764,20 +3937,20 @@ class VgiClient {
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableDrop(attachOpaqueData, schemaName, name, ignoreNotFound, cascade, transactionOpaqueData) {
+  async tableDrop(attachOpaqueData, schemaPath, name, ignoreNotFound, cascade, transactionOpaqueData) {
     await this.rpc.call("catalog_table_drop", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       ignore_not_found: ignoreNotFound ?? false,
       cascade: cascade ?? false,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableScanFunctionGet(attachOpaqueData, schemaName, name, atUnit, atValue, transactionOpaqueData) {
+  async tableScanFunctionGet(attachOpaqueData, schemaPath, name, atUnit, atValue, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_table_scan_function_get", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       at_unit: atUnit ?? null,
       at_value: atValue ?? null,
@@ -3787,30 +3960,30 @@ class VgiClient {
       throw new VgiClientError("table_scan_function_get returned null");
     return decodeScanFunctionResult(unwrapResult(result));
   }
-  async tableCommentSet(attachOpaqueData, schemaName, name, comment, ignoreNotFound, transactionOpaqueData) {
+  async tableCommentSet(attachOpaqueData, schemaPath, name, comment, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_comment_set", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       comment: comment ?? null,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableRename(attachOpaqueData, schemaName, name, newName, ignoreNotFound, transactionOpaqueData) {
+  async tableRename(attachOpaqueData, schemaPath, name, newName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_rename", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       new_name: newName,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableColumnAdd(attachOpaqueData, schemaName, name, columnName, columnType, defaultValue, ignoreNotFound, transactionOpaqueData) {
+  async tableColumnAdd(attachOpaqueData, schemaPath, name, columnName, columnType, defaultValue, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_column_add", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       column_type: columnType,
@@ -3819,20 +3992,20 @@ class VgiClient {
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableColumnDrop(attachOpaqueData, schemaName, name, columnName, ignoreNotFound, transactionOpaqueData) {
+  async tableColumnDrop(attachOpaqueData, schemaPath, name, columnName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_column_drop", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableColumnRename(attachOpaqueData, schemaName, name, columnName, newName, ignoreNotFound, transactionOpaqueData) {
+  async tableColumnRename(attachOpaqueData, schemaPath, name, columnName, newName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_column_rename", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       new_name: newName,
@@ -3840,10 +4013,10 @@ class VgiClient {
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableColumnDefaultSet(attachOpaqueData, schemaName, name, columnName, defaultValue, ignoreNotFound, transactionOpaqueData) {
+  async tableColumnDefaultSet(attachOpaqueData, schemaPath, name, columnName, defaultValue, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_column_default_set", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       default_value: defaultValue,
@@ -3851,20 +4024,20 @@ class VgiClient {
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableColumnDefaultDrop(attachOpaqueData, schemaName, name, columnName, ignoreNotFound, transactionOpaqueData) {
+  async tableColumnDefaultDrop(attachOpaqueData, schemaPath, name, columnName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_column_default_drop", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableColumnTypeChange(attachOpaqueData, schemaName, name, columnDefinition, expression, ignoreNotFound, transactionOpaqueData) {
+  async tableColumnTypeChange(attachOpaqueData, schemaPath, name, columnDefinition, expression, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_column_type_change", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_definition: columnDefinition,
       expression: expression ?? null,
@@ -3872,30 +4045,30 @@ class VgiClient {
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableNotNullSet(attachOpaqueData, schemaName, name, columnName, ignoreNotFound, transactionOpaqueData) {
+  async tableNotNullSet(attachOpaqueData, schemaPath, name, columnName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_not_null_set", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async tableNotNullDrop(attachOpaqueData, schemaName, name, columnName, ignoreNotFound, transactionOpaqueData) {
+  async tableNotNullDrop(attachOpaqueData, schemaPath, name, columnName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_table_not_null_drop", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       column_name: columnName,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async viewGet(attachOpaqueData, schemaName, name, transactionOpaqueData) {
+  async viewGet(attachOpaqueData, schemaPath, name, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_view_get", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
@@ -3905,50 +4078,50 @@ class VgiClient {
     const items = deserializeInfoList(inner.items, decodeViewInfo);
     return items.length > 0 ? items[0] : null;
   }
-  async viewCreate(attachOpaqueData, schemaName, name, definition, onConflict, transactionOpaqueData) {
+  async viewCreate(attachOpaqueData, schemaPath, name, definition, onConflict, transactionOpaqueData) {
     await this.rpc.call("catalog_view_create", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       definition,
       on_conflict: onConflict,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async viewDrop(attachOpaqueData, schemaName, name, ignoreNotFound, cascade, transactionOpaqueData) {
+  async viewDrop(attachOpaqueData, schemaPath, name, ignoreNotFound, cascade, transactionOpaqueData) {
     await this.rpc.call("catalog_view_drop", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       ignore_not_found: ignoreNotFound ?? false,
       cascade: cascade ?? false,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async viewRename(attachOpaqueData, schemaName, name, newName, ignoreNotFound, transactionOpaqueData) {
+  async viewRename(attachOpaqueData, schemaPath, name, newName, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_view_rename", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       new_name: newName,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async viewCommentSet(attachOpaqueData, schemaName, name, comment, ignoreNotFound, transactionOpaqueData) {
+  async viewCommentSet(attachOpaqueData, schemaPath, name, comment, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_view_comment_set", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       comment: comment ?? null,
       ignore_not_found: ignoreNotFound ?? null,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
   }
-  async macroGet(attachOpaqueData, schemaName, name, transactionOpaqueData) {
+  async macroGet(attachOpaqueData, schemaPath, name, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_macro_get", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
@@ -3958,10 +4131,10 @@ class VgiClient {
     const items = deserializeInfoList(inner.items, decodeMacroInfo);
     return items.length > 0 ? items[0] : null;
   }
-  async schemaContentsMacros(attachOpaqueData, name, type, transactionOpaqueData) {
+  async schemaContentsMacros(attachOpaqueData, path, type, transactionOpaqueData) {
     const result = await this.rpc.call("catalog_schema_contents_macros", {
       attach_opaque_data: attachOpaqueData,
-      name,
+      path: normalizeSchemaPath(path),
       type,
       transaction_opaque_data: transactionOpaqueData ?? null
     });
@@ -3970,22 +4143,10 @@ class VgiClient {
     const inner = unwrapResult(result);
     return deserializeInfoList(inner.items, decodeMacroInfo);
   }
-  async macroCreate(attachOpaqueData, schemaName, name, macroType, parameters, definition, onConflict, parameterDefaultValues, argumentsSchema, transactionOpaqueData) {
-    const schema3 = schema2([
-      field2("attach_opaque_data", binary2(), false),
-      field2("schema_name", utf82(), false),
-      field2("name", utf82(), false),
-      field2("macro_type", utf82(), false),
-      field2("parameters", list2(field2("item", utf82(), false)), false),
-      field2("definition", utf82(), false),
-      field2("on_conflict", utf82(), false),
-      field2("parameter_default_values", binary2(), true),
-      field2("arguments_schema", binary2(), true),
-      field2("transaction_opaque_data", binary2(), true)
-    ]);
+  async macroCreate(attachOpaqueData, schemaPath, name, macroType, parameters, definition, onConflict, parameterDefaultValues, argumentsSchema, transactionOpaqueData) {
     const innerBatch = batchFromColumns({
       attach_opaque_data: [attachOpaqueData],
-      schema_name: [schemaName],
+      schema_path: [normalizeSchemaPath(schemaPath)],
       name: [name],
       macro_type: [macroType],
       parameters: [parameters],
@@ -3994,13 +4155,13 @@ class VgiClient {
       parameter_default_values: [parameterDefaultValues ?? null],
       arguments_schema: [argumentsSchema ?? null],
       transaction_opaque_data: [transactionOpaqueData ?? null]
-    }, schema3);
+    }, MacroCreateRequestSchema);
     await this.rpc.call("catalog_macro_create", wrapRequest(innerBatch));
   }
-  async macroDrop(attachOpaqueData, schemaName, name, ignoreNotFound, transactionOpaqueData) {
+  async macroDrop(attachOpaqueData, schemaPath, name, ignoreNotFound, transactionOpaqueData) {
     await this.rpc.call("catalog_macro_drop", {
       attach_opaque_data: attachOpaqueData,
-      schema_name: schemaName,
+      schema_path: normalizeSchemaPath(schemaPath),
       name,
       ignore_not_found: ignoreNotFound ?? false,
       transaction_opaque_data: transactionOpaqueData ?? null
@@ -4060,18 +4221,18 @@ function argumentSpecsToSchema(specs) {
     if (spec.pattern !== undefined) {
       metadata.set(VGI_PATTERN_KEY, spec.pattern);
     }
-    const field3 = field2(spec.name, spec.arrowType, true, metadata.size > 0 ? metadata : undefined);
-    fields.push(field3);
+    const field = field2(spec.name, spec.arrowType, true, metadata.size > 0 ? metadata : undefined);
+    fields.push(field);
   }
   return schema2(fields);
 }
-function schemaToArgumentSpecs(schema3) {
+function schemaToArgumentSpecs(schema) {
   const specs = [];
   let positionIndex = 0;
-  for (const field3 of schema3.fields) {
-    const metadata = field3.metadata;
+  for (const field of schema.fields) {
+    const metadata = field.metadata;
     const isNamed = metadata.get(VGI_ARG_KEY) === VGI_ARG_NAMED;
-    const position = isNamed ? field3.name : positionIndex++;
+    const position = isNamed ? field.name : positionIndex++;
     const vgiType = metadata.get(VGI_TYPE_KEY);
     const isTableInput = vgiType === VGI_TYPE_TABLE;
     const isAnyType = vgiType === VGI_TYPE_ANY;
@@ -4083,9 +4244,9 @@ function schemaToArgumentSpecs(schema3) {
     const rangeNotation = metadata.get(VGI_RANGE_KEY);
     const pattern = metadata.get(VGI_PATTERN_KEY);
     specs.push({
-      name: field3.name,
+      name: field.name,
       position,
-      arrowType: field3.type,
+      arrowType: field.type,
       isTableInput,
       isAnyType,
       isVarargs,
@@ -4135,6 +4296,7 @@ function deserializeAttachOptionSpecs(specs) {
   return Array.from(specs, deserializeAttachOptionSpec);
 }
 export {
+  ArgumentMonotonicity,
   ArgumentValidationError,
   Arguments,
   CatalogAlreadyExistsError,
@@ -4185,4 +4347,4 @@ export {
   typeSignature
 };
 
-//# debugId=96F67925F48EAE1464756E2164756E21
+//# debugId=D11759D49AEAE35964756E2164756E21