From b9d55ef676b5cd7b8b081759091e55cb85bb56fd Mon Sep 17 00:00:00 2001
From: Ian Streeter <ian@snowplowanalytics.com>
Date: Fri, 10 May 2024 17:46:54 +0100
Subject: [PATCH] Possible fix for fields starting with numerics

---
 .../processing/BigQuerySchemaUtils.scala                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/scala/com.snowplowanalytics.snowplow.bigquery/processing/BigQuerySchemaUtils.scala b/modules/core/src/main/scala/com.snowplowanalytics.snowplow.bigquery/processing/BigQuerySchemaUtils.scala
index 43180848..5f2843cb 100644
--- a/modules/core/src/main/scala/com.snowplowanalytics.snowplow.bigquery/processing/BigQuerySchemaUtils.scala
+++ b/modules/core/src/main/scala/com.snowplowanalytics.snowplow.bigquery/processing/BigQuerySchemaUtils.scala
@@ -21,7 +21,7 @@ object BigQuerySchemaUtils {
 
   def fieldsMissingFromDescriptor(tableDescriptor: Descriptors.Descriptor, bqFields: FieldList): Boolean =
     bqFields.asScala.exists { field =>
-      Option(tableDescriptor.findFieldByName(field.getName)) match {
+      tableDescriptor.getFields.asScala.find(_.getJsonName === field.getName) match {
         case Some(fieldDescriptor) =>
           val nullableMismatch = fieldDescriptor.isRequired && (field.getMode === BQField.Mode.NULLABLE)
           nullableMismatch || nestedFieldMissingFromDescriptor(fieldDescriptor, field)
@@ -45,7 +45,7 @@ object BigQuerySchemaUtils {
 
   def alterTableRequired(tableDescriptor: Descriptors.Descriptor, ddlFields: Vector[Field]): Vector[Field] =
     ddlFields.filter { field =>
-      Option(tableDescriptor.findFieldByName(field.name)) match {
+      tableDescriptor.getFields.asScala.find(_.getJsonName === field.name) match {
         case Some(fieldDescriptor) =>
           val nullableMismatch = fieldDescriptor.isRequired && field.nullability.nullable
           nullableMismatch || alterTableRequiredForNestedFields(fieldDescriptor, field)