From faaf0aa9bcd065da7c2754f760ecbd018b9458d0 Mon Sep 17 00:00:00 2001 From: David Coe Date: Tue, 12 Dec 2023 16:30:19 -0500 Subject: [PATCH] merge fix --- .../src/Drivers/BigQuery/BigQueryStatement.cs | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/csharp/src/Drivers/BigQuery/BigQueryStatement.cs b/csharp/src/Drivers/BigQuery/BigQueryStatement.cs index 7d14bf8ccd..1c5347ef4a 100644 --- a/csharp/src/Drivers/BigQuery/BigQueryStatement.cs +++ b/csharp/src/Drivers/BigQuery/BigQueryStatement.cs @@ -87,10 +87,6 @@ private Field TranslateField(TableFieldSchema field) return new Field(field.Name, TranslateType(field), field.Mode == "NULLABLE"); } -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 641a6fe4 (fix line endings) public override object GetValue(IArrowArray arrowArray, Field field, int index) { switch(arrowArray) @@ -104,24 +100,6 @@ public override object GetValue(IArrowArray arrowArray, Field field, int index) } } -<<<<<<< HEAD -======= - public override object GetValue(IArrowArray arrowArray, Field field, int index) - { - switch(arrowArray) - { - case StructArray structArray: - return SerializeToJson(structArray, index); - case ListArray listArray: - return listArray.GetSlicedValues(index); - default: - return base.GetValue(arrowArray, field, index); - } - } - ->>>>>>> be35986c (add back support for List, Struct types) -======= ->>>>>>> 641a6fe4 (fix line endings) private IArrowType TranslateType(TableFieldSchema field) { // per https://developers.google.com/resources/api-libraries/documentation/bigquery/v2/java/latest/com/google/api/services/bigquery/model/TableFieldSchema.html#getType--