@query-farm/vgi 0.28.0 → 0.29.0

package/src/protocol/handlers/catalog/admin.ts

@@ -7,16 +7,33 @@ import { Protocol, type CallContext } from "@query-farm/vgi-rpc";
 import { encodeSchemaInfo, encodeTableInfo, encodeViewInfo, encodeFunctionInfo, encodeCatalogInfo } from "../../../generated/vgi-client.js";
 import { encodeCopyFromFormatInfo } from "../../../catalog/interface.js";
 import {
-  CatalogCatalogsResultSchema,
+  CatalogAttachParamsSchema,
   CatalogAttachResultSchema,
-  CatalogVersionResultSchema,
-  CatalogTransactionBeginResultSchema,
-  CatalogSchemasResultSchema,
-  CatalogSchemaGetResultSchema,
+  CatalogCatalogsParamsSchema,
+  CatalogCatalogsResultSchema,
+  CatalogCopyFromFormatsParamsSchema,
+  CatalogCopyFromFormatsResultSchema,
+  CatalogCreateParamsSchema,
+  CatalogDetachParamsSchema,
+  CatalogDropParamsSchema,
+  CatalogSchemaContentsFunctionsParamsSchema,
+  CatalogSchemaContentsFunctionsResultSchema,
+  CatalogSchemaContentsTablesParamsSchema,
   CatalogSchemaContentsTablesResultSchema,
+  CatalogSchemaContentsViewsParamsSchema,
   CatalogSchemaContentsViewsResultSchema,
-  CatalogSchemaContentsFunctionsResultSchema,
-  CatalogCopyFromFormatsResultSchema,
+  CatalogSchemaCreateParamsSchema,
+  CatalogSchemaDropParamsSchema,
+  CatalogSchemaGetParamsSchema,
+  CatalogSchemaGetResultSchema,
+  CatalogSchemasParamsSchema,
+  CatalogSchemasResultSchema,
+  CatalogTransactionBeginParamsSchema,
+  CatalogTransactionBeginResultSchema,
+  CatalogTransactionCommitParamsSchema,
+  CatalogTransactionRollbackParamsSchema,
+  CatalogVersionParamsSchema,
+  CatalogVersionResultSchema,
 } from "../../../generated/vgi-protocol-schemas.js";
 import { toUint8Array } from "../../../util/bytes.js";
 import { decodeDictValue } from "../../../util/arrow/index.js";
@@ -30,9 +47,6 @@ import {
   type GetCatalog,
   decodeOptionsBatch,
   emptyResultSchema,
-  attachOpaqueDataParam,
-  attachOpaqueDataTxnParams,
-  attachOpaqueDataNameTxnParams,
   catalogUnary,
   sealAttach,
   openAttach,
@@ -42,7 +56,7 @@ import {
 export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetCatalog, signingKey?: Uint8Array): void {
   // catalog_catalogs
   catalogUnary(protocol, signingKey, "catalog_catalogs", {
-    params: emptyResultSchema,
+    params: CatalogCatalogsParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async () => {
       const cat = getCatalog();
@@ -66,7 +80,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_attach (params wrapped in request: Binary like bind/init)
   protocol.unary("catalog_attach", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: CatalogAttachParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params, ctx) => {
       const innerParams = unwrapRequest(params.request);
@@ -122,7 +136,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_detach
   catalogUnary(protocol, signingKey, "catalog_detach", {
-    params: attachOpaqueDataParam,
+    params: CatalogDetachParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -133,11 +147,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_create
   catalogUnary(protocol, signingKey, "catalog_create", {
-    params: schema([
-      field("name", utf8(), false),
-      field("on_conflict", utf8(), false),
-      field("options", binary(), true),
-    ]),
+    params: CatalogCreateParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -148,7 +158,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_drop
   catalogUnary(protocol, signingKey, "catalog_drop", {
-    params: schema([field("name", utf8(), false)]),
+    params: CatalogDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -159,7 +169,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_version
   catalogUnary(protocol, signingKey, "catalog_version", {
-    params: attachOpaqueDataTxnParams,
+    params: CatalogVersionParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -175,7 +185,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
   // envelope to bind the transaction envelope's AAD, so it cannot route
   // through catalogUnary (which would replace it with plaintext).
   protocol.unary("catalog_transaction_begin", {
-    params: attachOpaqueDataParam,
+    params: CatalogTransactionBeginParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params, ctx) => {
       const auth = (ctx as CallContext | undefined)?.auth;
@@ -194,7 +204,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_transaction_commit
   catalogUnary(protocol, signingKey, "catalog_transaction_commit", {
-    params: attachOpaqueDataTxnParams,
+    params: CatalogTransactionCommitParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -208,7 +218,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_transaction_rollback
   catalogUnary(protocol, signingKey, "catalog_transaction_rollback", {
-    params: attachOpaqueDataTxnParams,
+    params: CatalogTransactionRollbackParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -222,7 +232,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schemas
   catalogUnary(protocol, signingKey, "catalog_schemas", {
-    params: attachOpaqueDataTxnParams,
+    params: CatalogSchemasParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -239,7 +249,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
   // catalog_copy_from_formats — catalog-level (not schema-scoped). Lists the
   // custom COPY ... FROM formats this catalog advertises; empty list when none.
   catalogUnary(protocol, signingKey, "catalog_copy_from_formats", {
-    params: attachOpaqueDataTxnParams,
+    params: CatalogCopyFromFormatsParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -255,7 +265,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_get
   catalogUnary(protocol, signingKey, "catalog_schema_get", {
-    params: attachOpaqueDataNameTxnParams,
+    params: CatalogSchemaGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -272,13 +282,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_create
   catalogUnary(protocol, signingKey, "catalog_schema_create", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("name", utf8(), false),
-      field("comment", utf8(), true),
-      field("tags", binary(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogSchemaCreateParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -295,13 +299,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_drop
   catalogUnary(protocol, signingKey, "catalog_schema_drop", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("name", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("cascade", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogSchemaDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -318,7 +316,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_contents_tables
   catalogUnary(protocol, signingKey, "catalog_schema_contents_tables", {
-    params: attachOpaqueDataNameTxnParams,
+    params: CatalogSchemaContentsTablesParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -335,7 +333,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_contents_views
   catalogUnary(protocol, signingKey, "catalog_schema_contents_views", {
-    params: attachOpaqueDataNameTxnParams,
+    params: CatalogSchemaContentsViewsParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -352,12 +350,7 @@ export function registerCatalogAdminMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_contents_functions
   catalogUnary(protocol, signingKey, "catalog_schema_contents_functions", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("name", utf8(), false),
-      field("type", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogSchemaContentsFunctionsParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();

package/src/protocol/handlers/catalog/index_methods.ts

@@ -5,7 +5,9 @@ import { type VgiSchema, schema, type VgiField, field, type VgiDataType, binary,
 import { Protocol } from "@query-farm/vgi-rpc";
 import { encodeIndexInfo } from "../../../generated/vgi-client.js";
 import {
+  CatalogIndexGetParamsSchema,
   CatalogIndexGetResultSchema,
+  CatalogSchemaContentsIndexesParamsSchema,
   CatalogSchemaContentsIndexesResultSchema,
 } from "../../../generated/vgi-protocol-schemas.js";
 import { toUint8Array } from "../../../util/bytes.js";
@@ -21,11 +23,7 @@ import {
 export function registerCatalogIndexMethods(protocol: Protocol, getCatalog: GetCatalog, signingKey?: Uint8Array): void {
   // catalog_schema_contents_indexes
   catalogUnary(protocol, signingKey, "catalog_schema_contents_indexes", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("name", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogSchemaContentsIndexesParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -42,12 +40,7 @@ export function registerCatalogIndexMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_index_get
   catalogUnary(protocol, signingKey, "catalog_index_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogIndexGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();

package/src/protocol/handlers/catalog/macro.ts

@@ -5,7 +5,11 @@ import { type VgiSchema, schema, type VgiField, field, type VgiDataType, binary,
 import { Protocol } from "@query-farm/vgi-rpc";
 import { encodeMacroInfo } from "../../../generated/vgi-client.js";
 import {
+  CatalogMacroCreateParamsSchema,
+  CatalogMacroDropParamsSchema,
+  CatalogMacroGetParamsSchema,
   CatalogMacroGetResultSchema,
+  CatalogSchemaContentsMacrosParamsSchema,
   CatalogSchemaContentsMacrosResultSchema,
 } from "../../../generated/vgi-protocol-schemas.js";
 import type { MacroType } from "../../../catalog/interface.js";
@@ -20,14 +24,13 @@ import {
 import {
   type GetCatalog,
   emptyResultSchema,
-  attachOpaqueDataSchemaNameTxnParams,
   catalogUnary,
 } from "./shared.js";
 
 export function registerCatalogMacroMethods(protocol: Protocol, getCatalog: GetCatalog, signingKey?: Uint8Array): void {
   // catalog_macro_get
   catalogUnary(protocol, signingKey, "catalog_macro_get", {
-    params: attachOpaqueDataSchemaNameTxnParams,
+    params: CatalogMacroGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -45,7 +48,7 @@ export function registerCatalogMacroMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_macro_create
   catalogUnary(protocol, signingKey, "catalog_macro_create", {
-    params: REQUEST_PARAMS_SCHEMA,
+    params: CatalogMacroCreateParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -68,13 +71,7 @@ export function registerCatalogMacroMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_macro_drop
   catalogUnary(protocol, signingKey, "catalog_macro_drop", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogMacroDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -91,12 +88,7 @@ export function registerCatalogMacroMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_schema_contents_macros
   catalogUnary(protocol, signingKey, "catalog_schema_contents_macros", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("name", utf8(), false),
-      field("type", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogSchemaContentsMacrosParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();

package/src/protocol/handlers/catalog/shared.ts

@@ -1,7 +1,7 @@
 // Copyright 2025, 2026 Query Farm LLC - https://query.farm
 // Shared param schemas and helpers for catalog protocol handlers.
 
-import { type VgiSchema, schema, type VgiField, field, type VgiDataType, binary, utf8, bool, iterRows } from "../../../arrow/index.js";
+import { type VgiSchema, schema, iterRows } from "../../../arrow/index.js";
 import { Protocol, type AuthContext, type CallContext } from "@query-farm/vgi-rpc";
 import type { CatalogInterface } from "../../../catalog/interface.js";
 import { NoCatalogError } from "../../../errors.js";
@@ -233,59 +233,12 @@ export function decodeOptionsBatch(bytes: any): Record<string, unknown> {
 
 export const emptyResultSchema = schema([]);
 
-export const attachOpaqueDataParam = schema([
-  field("attach_opaque_data", binary(), true),
-]);
-
-export const attachOpaqueDataTxnParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("transaction_opaque_data", binary(), true),
-]);
-
-export const attachOpaqueDataNameTxnParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("name", utf8(), false),
-  field("transaction_opaque_data", binary(), true),
-]);
-
-export const attachOpaqueDataSchemaNameTxnParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("schema_name", utf8(), false),
-  field("name", utf8(), false),
-  field("transaction_opaque_data", binary(), true),
-]);
-
-export const schemaNameIgnoreNotFoundTxnParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("schema_name", utf8(), false),
-  field("name", utf8(), false),
-  field("ignore_not_found", bool(), true),
-  field("transaction_opaque_data", binary(), true),
-]);
-
-export const schemaNameCommentParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("schema_name", utf8(), false),
-  field("name", utf8(), false),
-  field("comment", utf8(), true),
-  field("ignore_not_found", bool(), true),
-  field("transaction_opaque_data", binary(), true),
-]);
-
-export const schemaNameRenameParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("schema_name", utf8(), false),
-  field("name", utf8(), false),
-  field("new_name", utf8(), false),
-  field("ignore_not_found", bool(), true),
-  field("transaction_opaque_data", binary(), true),
-]);
-
-export const columnOpParams = schema([
-  field("attach_opaque_data", binary(), true),
-  field("schema_name", utf8(), false),
-  field("name", utf8(), false),
-  field("column_name", utf8(), false),
-  field("ignore_not_found", bool(), true),
-  field("transaction_opaque_data", binary(), true),
-]);
+// Eight hand-written catalog param schemas used to live here, restating shapes
+// codegen already emits. Every `params:` slot now points at a generated
+// `…ParamsSchema` and these were left behind, referenced by nothing but their
+// own import lines. A stale duplicate is worse than no duplicate: the copies
+// this SDK kept had drifted on `attach_opaque_data` nullability (45 generated
+// schemas say non-null, every copy said nullable) and on `type` being
+// dictionary-encoded utf8 rather than plain utf8, and the result was that a
+// CORRECT client got rejected at the very first catalog call. Import from
+// src/generated/vgi-protocol-schemas.ts instead of reviving one.

package/src/protocol/handlers/catalog/table.ts

@@ -6,9 +6,25 @@ import { type VgiSchema, schema, type VgiField, field, type VgiDataType, binary,
 import { Protocol } from "@query-farm/vgi-rpc";
 import { encodeTableInfo } from "../../../generated/vgi-client.js";
 import {
+  CatalogTableColumnAddParamsSchema,
+  CatalogTableColumnDefaultDropParamsSchema,
+  CatalogTableColumnDefaultSetParamsSchema,
+  CatalogTableColumnDropParamsSchema,
+  CatalogTableColumnRenameParamsSchema,
+  CatalogTableColumnStatisticsGetParamsSchema,
+  CatalogTableColumnTypeChangeParamsSchema,
+  CatalogTableCommentSetParamsSchema,
+  CatalogTableCreateParamsSchema,
+  CatalogTableDropParamsSchema,
+  CatalogTableGetParamsSchema,
   CatalogTableGetResultSchema,
-  ScanFunctionResultSchema,
+  CatalogTableNotNullDropParamsSchema,
+  CatalogTableNotNullSetParamsSchema,
+  CatalogTableRenameParamsSchema,
+  CatalogTableScanBranchesGetParamsSchema,
+  CatalogTableScanFunctionGetParamsSchema,
   ScanBranchesResultSchema,
+  ScanFunctionResultSchema,
 } from "../../../generated/vgi-protocol-schemas.js";
 import { toUint8Array } from "../../../util/bytes.js";
 import {
@@ -19,24 +35,13 @@ import {
 import {
   type GetCatalog,
   emptyResultSchema,
-  schemaNameIgnoreNotFoundTxnParams,
-  schemaNameCommentParams,
-  schemaNameRenameParams,
-  columnOpParams,
   catalogUnary,
 } from "./shared.js";
 
 export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetCatalog, signingKey?: Uint8Array): void {
   // catalog_table_get
   catalogUnary(protocol, signingKey, "catalog_table_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("at_unit", utf8(), true),
-      field("at_value", utf8(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -56,17 +61,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_create
   catalogUnary(protocol, signingKey, "catalog_table_create", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("columns", binary(), false),
-      field("on_conflict", utf8(), false),
-      field("not_null_constraints", list(field("item", int32(), false)), true),
-      field("unique_constraints", list(field("item", list(field("item", int32(), false)), false)), true),
-      field("check_constraints", list(field("item", utf8(), false)), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableCreateParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -87,13 +82,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_drop
   catalogUnary(protocol, signingKey, "catalog_table_drop", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -110,12 +99,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_statistics_get
   catalogUnary(protocol, signingKey, "catalog_table_column_statistics_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnStatisticsGetParamsSchema,
     result: RESULT_BINARY_NULLABLE_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -131,14 +115,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_scan_function_get
   catalogUnary(protocol, signingKey, "catalog_table_scan_function_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("at_unit", utf8(), true),
-      field("at_value", utf8(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableScanFunctionGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -158,14 +135,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
   // scan_function_get. The branches-aware C++ extension calls this for every
   // table scan; single-source catalogs synthesise a one-branch result.
   catalogUnary(protocol, signingKey, "catalog_table_scan_branches_get", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("at_unit", utf8(), true),
-      field("at_value", utf8(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableScanBranchesGetParamsSchema,
     result: RESULT_BINARY_SCHEMA,
     handler: async (params) => {
       const cat = getCatalog();
@@ -183,7 +153,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_comment_set
   catalogUnary(protocol, signingKey, "catalog_table_comment_set", {
-    params: schemaNameCommentParams,
+    params: CatalogTableCommentSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -201,7 +171,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_rename
   catalogUnary(protocol, signingKey, "catalog_table_rename", {
-    params: schemaNameRenameParams,
+    params: CatalogTableRenameParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -219,16 +189,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_add
   catalogUnary(protocol, signingKey, "catalog_table_column_add", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("column_type", utf8(), false),
-      field("default_value", utf8(), true),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnAddParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -248,7 +209,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_drop
   catalogUnary(protocol, signingKey, "catalog_table_column_drop", {
-    params: columnOpParams,
+    params: CatalogTableColumnDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -266,15 +227,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_rename
   catalogUnary(protocol, signingKey, "catalog_table_column_rename", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("new_name", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnRenameParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -293,15 +246,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_default_set
   catalogUnary(protocol, signingKey, "catalog_table_column_default_set", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("default_value", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnDefaultSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -320,7 +265,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_default_drop
   catalogUnary(protocol, signingKey, "catalog_table_column_default_drop", {
-    params: columnOpParams,
+    params: CatalogTableColumnDefaultDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -338,15 +283,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_column_type_change
   catalogUnary(protocol, signingKey, "catalog_table_column_type_change", {
-    params: schema([
-      field("attach_opaque_data", binary(), true),
-      field("schema_name", utf8(), false),
-      field("name", utf8(), false),
-      field("column_name", utf8(), false),
-      field("new_type", utf8(), false),
-      field("ignore_not_found", bool(), true),
-      field("transaction_opaque_data", binary(), true),
-    ]),
+    params: CatalogTableColumnTypeChangeParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -365,7 +302,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_not_null_set
   catalogUnary(protocol, signingKey, "catalog_table_not_null_set", {
-    params: columnOpParams,
+    params: CatalogTableNotNullSetParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();
@@ -383,7 +320,7 @@ export function registerCatalogTableMethods(protocol: Protocol, getCatalog: GetC
 
   // catalog_table_not_null_drop
   catalogUnary(protocol, signingKey, "catalog_table_not_null_drop", {
-    params: columnOpParams,
+    params: CatalogTableNotNullDropParamsSchema,
     result: emptyResultSchema,
     handler: async (params) => {
       const cat = getCatalog();