From 4e717c8b979da1beb63dcf220c552b84871a9be5 Mon Sep 17 00:00:00 2001
From: Nathan <148575555+nathan-artie@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:45:41 -0700
Subject: [PATCH] Error messages

---
 clients/bigquery/storagewrite.go | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/clients/bigquery/storagewrite.go b/clients/bigquery/storagewrite.go
index bf32974c0..fba0e7053 100644
--- a/clients/bigquery/storagewrite.go
+++ b/clients/bigquery/storagewrite.go
@@ -16,22 +16,6 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-func schemaToMessageDescriptor(schema bigquery.Schema) (*protoreflect.MessageDescriptor, error) {
-	storageSchema, err := adapt.BQSchemaToStorageTableSchema(schema)
-	if err != nil {
-		return nil, fmt.Errorf("failed to adapt BigQuery schema to protocol buffer schema: %w", err)
-	}
-	descriptor, err := adapt.StorageSchemaToProto2Descriptor(storageSchema, "root")
-	if err != nil {
-		return nil, fmt.Errorf("failed to build protocol buffer descriptor: %w", err)
-	}
-	messageDescriptor, ok := descriptor.(protoreflect.MessageDescriptor)
-	if !ok {
-		return nil, fmt.Errorf("adapted descriptor is not a message descriptor")
-	}
-	return &messageDescriptor, nil
-}
-
 func columnToFieldSchema(column columns.Column) (*bigquery.FieldSchema, error) {
 	var fieldType bigquery.FieldType
 	var repeated bool
@@ -83,7 +67,20 @@ func columnsToMessageDescriptor(cols []columns.Column) (*protoreflect.MessageDes
 		}
 		fields[i] = field
 	}
-	return schemaToMessageDescriptor(fields)
+
+	storageSchema, err := adapt.BQSchemaToStorageTableSchema(fields)
+	if err != nil {
+		return nil, fmt.Errorf("failed to adapt BigQuery schema to storage table schema: %w", err)
+	}
+	descriptor, err := adapt.StorageSchemaToProto2Descriptor(storageSchema, "root")
+	if err != nil {
+		return nil, fmt.Errorf("failed to build proto descriptor: %w", err)
+	}
+	messageDescriptor, ok := descriptor.(protoreflect.MessageDescriptor)
+	if !ok {
+		return nil, fmt.Errorf("proto descriptor is not a message descriptor")
+	}
+	return &messageDescriptor, nil
 }
 
 // From https://cloud.google.com/java/docs/reference/google-cloud-bigquerystorage/latest/com.google.cloud.bigquery.storage.v1.CivilTimeEncoder