CurtHagenlocher commented on code in PR #2541:
URL: https://github.com/apache/arrow-adbc/pull/2541#discussion_r1970275592
##########
csharp/src/Drivers/BigQuery/BigQueryStatement.cs:
##########
@@ -51,7 +51,26 @@ public BigQueryStatement(BigQueryClient client,
GoogleCredential credential)
public override QueryResult ExecuteQuery()
{
- QueryOptions? queryOptions = ValidateOptions();
+ QueryOptions queryOptions = ValidateOptions();
+
+ if (this.client.ProjectId == BigQueryConstants.DetectProjectId)
Review Comment:
Wouldn't the same logic also be needed for `ExecuteUpdate`?
##########
csharp/test/Apache.Arrow.Adbc.Tests/MultiEnvironmentTestUtils.cs:
##########
@@ -0,0 +1,90 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+
+namespace Apache.Arrow.Adbc.Tests
+{
+ public static class MultiEnvironmentTestUtils
+ {
+ public static T LoadMultiEnvironmentTestConfiguration<T>(string
environmentVariable)
+ {
+ T? testConfiguration = default(T);
+
+ if (!string.IsNullOrWhiteSpace(environmentVariable))
+ {
+ string? environmentValue =
Environment.GetEnvironmentVariable(environmentVariable);
+
+ if (!string.IsNullOrWhiteSpace(environmentValue))
+ {
+ if (File.Exists(environmentValue))
+ {
+ // use a JSON file for the various settings
+ string json = File.ReadAllText(environmentValue);
+
+ testConfiguration =
JsonSerializer.Deserialize<T>(json)!;
+ }
+ }
+ }
+
+ if (testConfiguration == null)
+ throw new InvalidOperationException($"Cannot execute test
configuration from environment variable `{environmentVariable}`");
+
+ return testConfiguration;
+ }
+
+ public static List<TEnvironment>
GetTestEnvironments<TEnvironment>(MultiEnvironmentTestConfiguration<TEnvironment>
testConfiguration)
+ where TEnvironment : TestConfiguration
+ {
+ if (testConfiguration == null)
+ throw new ArgumentNullException(nameof(testConfiguration));
+
+ if (testConfiguration.Environments == null ||
testConfiguration.Environments.Count == 0)
+ throw new InvalidOperationException("There are no environments
configured");
+
+ List<TEnvironment> environments = new List<TEnvironment>();
+
+ foreach (string environmentName in
GetEnvironmentNames(testConfiguration.TestEnvironmentNames))
+ {
+ if
(testConfiguration.Environments.TryGetValue(environmentName, out TEnvironment?
testEnvironment))
+ {
+ if (testEnvironment != null)
+ {
+ testEnvironment.Name = environmentName;
+ environments.Add(testEnvironment);
+ }
+ }
+ }
+
+ if (environments.Count == 0)
+ throw new InvalidOperationException("Could not find a
configured Flight SQL environment");
Review Comment:
Is this error message more specific than it should be?
##########
csharp/test/Apache.Arrow.Adbc.Tests/MultiEnvironmentTestConfiguration.cs:
##########
@@ -0,0 +1,37 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Apache.Arrow.Adbc.Tests
+{
+ public abstract class MultiEnvironmentTestConfiguration<T>
+ {
+ /// <summary>
+ /// A comma separated list of testable environments.
Review Comment:
Comment is at odds with property definition
##########
csharp/test/Apache.Arrow.Adbc.Tests/MultiEnvironmentTestConfiguration.cs:
##########
@@ -0,0 +1,37 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Apache.Arrow.Adbc.Tests
+{
+ public abstract class MultiEnvironmentTestConfiguration<T>
+ {
+ /// <summary>
+ /// A comma separated list of testable environments.
+ /// </summary>
+ [JsonPropertyName("testEnvironments")]
+ public List<string> TestEnvironmentNames { get; set; } = new
List<string>();
+
+ /// <summary>
+ /// The active test environment.
Review Comment:
Comment seems to be at odds with both the property definition and the sample
file.
What would it mean for the keys of this dictionary to be different than the
list of names in `TestEnvironmentNames`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
