Skip to content

Commit 445d3e9

Browse files
committed
Merge remote-tracking branch 'googleapis/main' into bigtable-sql/conformance-tests-2
2 parents 882f299 + 19851cb commit 445d3e9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

google/cloud/bigtable/test_proxy/cbt_test_proxy.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,15 @@ grpc::Status CbtTestProxy::ExecuteQuery(
416416

417417
// populate metadata
418418
google::bigtable::testproxy::ResultSetMetadata metadata;
419-
for (auto const& column : bound_query_metadata.proto_schema().columns()) {
420-
*metadata.add_columns() = column;
419+
auto prepared_query_response = prepared_query->response();
420+
if (prepared_query_response) {
421+
auto prepared_query_metadata = prepared_query->response()->metadata();
422+
for (auto const& column :
423+
prepared_query_metadata.proto_schema().columns()) {
424+
*metadata.add_columns() = column;
425+
}
421426
}
422427
*response->mutable_metadata() = metadata;
423-
424428
*response->mutable_status() = ToRpcStatus(status);
425429
return grpc::Status();
426430
}

0 commit comments

Comments
 (0)