Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/user/content/sql/system-catalog/mz_internal.md
Original file line number Diff line number Diff line change
Expand Up @@ -1633,13 +1633,16 @@ The `mz_webhook_sources` table contains a row for each webhook source in the sys

<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_activity_log_thinned -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_columns -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_functions -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_index_columns -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_indexes -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_log_indexes -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_materialized_views -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_object_mappings -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_operators -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_sources -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_tables -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_types -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_builtin_views -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_catalog_item_metadata -->
<!-- RELATION_SPEC_UNDOCUMENTED mz_internal.mz_catalog_items -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,31 @@
# dependencies, so conversions there cannot poison customer catalogs.
# mz_role_auth is excluded because only mz_system can read it.
_STABLE_BUILTINS: dict[str, MzVersion | None] = {
"mz_array_types": None,
"mz_array_types": MzVersion.parse_mz("v26.52.0"),
"mz_audit_events": MzVersion.parse_mz("v26.33.0"),
"mz_aws_privatelink_connections": MzVersion.parse_mz("v26.37.0"),
"mz_base_types": None,
"mz_base_types": MzVersion.parse_mz("v26.52.0"),
"mz_cluster_replica_sizes": None,
"mz_cluster_replicas": MzVersion.parse_mz("v26.30.0"),
"mz_clusters": MzVersion.parse_mz("v26.30.0"),
"mz_columns": MzVersion.parse_mz("v26.49.0"),
"mz_default_privileges": MzVersion.parse_mz("v26.30.0"),
"mz_egress_ips": None,
"mz_functions": None,
"mz_functions": MzVersion.parse_mz("v26.52.0"),
"mz_iceberg_sinks": MzVersion.parse_mz("v26.38.0"),
"mz_index_columns": MzVersion.parse_mz("v26.49.0"),
"mz_kafka_connections": MzVersion.parse_mz("v26.37.0"),
"mz_kafka_sinks": MzVersion.parse_mz("v26.38.0"),
"mz_kafka_sources": MzVersion.parse_mz("v26.34.0"),
"mz_list_types": None,
"mz_map_types": None,
"mz_operators": None,
"mz_pseudo_types": None,
"mz_list_types": MzVersion.parse_mz("v26.52.0"),
"mz_map_types": MzVersion.parse_mz("v26.52.0"),
"mz_operators": MzVersion.parse_mz("v26.52.0"),
"mz_pseudo_types": MzVersion.parse_mz("v26.52.0"),
"mz_sinks": MzVersion.parse_mz("v26.38.0"),
"mz_ssh_tunnel_connections": MzVersion.parse_mz("v26.37.0"),
"mz_system_privileges": MzVersion.parse_mz("v26.30.0"),
"mz_tables": MzVersion.parse_mz("v26.39.0"),
"mz_types": None,
"mz_types": MzVersion.parse_mz("v26.52.0"),
"mz_views": MzVersion.parse_mz("v26.39.0"),
}

Expand Down
45 changes: 45 additions & 0 deletions src/adapter/src/catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4149,6 +4149,51 @@ mod tests {
}
}

// Make sure the typlen from `from_builtin_oid` equals the one pgwire sends.
#[mz_ore::test(tokio::test)]
#[cfg_attr(miri, ignore)] // unsupported operation: can't call foreign function `TLS_client_method` on OS `linux`
async fn test_builtin_type_typlen_known_and_matches_pgwire() {
Catalog::with_debug(|catalog| async move {
let conn_catalog = catalog.for_system_session();

for ty in BUILTINS::types() {
let id = conn_catalog
.resolve_type(&PartialItemName {
database: None,
schema: Some(ty.schema.into()),
item: ty.name.to_string(),
})
.expect("unable to resolve type")
.id();
let builtin_type = mz_pgrepr::Type::from_builtin_oid(ty.oid);
if !matches!(ty.details.typ, CatalogType::Pseudo) {
assert!(
builtin_type.is_some(),
"mz_pgrepr::Type::from_builtin_oid does not know {}, so mz_builtin_types would report a NULL typlen for it",
ty.name
);
}
let Some(builtin_type) = builtin_type else {
continue;
};
let Ok(scalar_type) =
mz_sql::plan::scalar_type_from_catalog(&conn_catalog, id, &[])
else {
continue;
};
let pgwire_typlen = mz_pgrepr::Type::from(&scalar_type).typlen();
let builtin_typlen = builtin_type.typlen();
assert_eq!(
builtin_typlen, pgwire_typlen,
"type {} has typlen {} in mz_builtin_types but pgwire sends {}",
ty.name, builtin_typlen, pgwire_typlen,
);
}
catalog.expire().await;
})
.await;
}

// Make sure pg views don't use types that only exist in Materialize.
#[mz_ore::test(tokio::test)]
#[cfg_attr(miri, ignore)] // unsupported operation: can't call foreign function `TLS_client_method` on OS `linux`
Expand Down
Loading
Loading