diff --git a/libtsuba/src/AddProperties.cpp b/libtsuba/src/AddProperties.cpp index a043bcb866..7cdd829876 100644 --- a/libtsuba/src/AddProperties.cpp +++ b/libtsuba/src/AddProperties.cpp @@ -35,19 +35,13 @@ DoLoadProperties( std::shared_ptr out = std::move(out_res.value()); - std::shared_ptr schema = out->schema(); - if (schema->num_fields() != 1) { + auto renamed = out->RenameColumns({expected_name}); + if (!renamed.ok()) { + std::shared_ptr schema = out->schema(); return KATANA_ERROR( - tsuba::ErrorCode::InvalidArgument, "expected 1 field found {} instead", - schema->num_fields()); + tsuba::ErrorCode::InvalidArgument, "{}", renamed.status().ToString()); } - - if (schema->field(0)->name() != expected_name) { - return KATANA_ERROR( - tsuba::ErrorCode::InvalidArgument, "expected {} found {} instead", - expected_name, schema->field(0)->name()); - } - return out; + return renamed.ValueOrDie(); } } // namespace