Possible fix for fields starting with numerics

snowplow-incubator · May 10, 2024 · b9d55ef · b9d55ef
1 parent c1951fe
commit b9d55ef
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...c/main/scala/com.snowplowanalytics.snowplow.bigquery/processing/BigQuerySchemaUtils.scala b/...c/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)