(arrow-adbc) branch main updated: fix(csharp/src/Drivers): Make AdbcCommandTimeoutProperty to optional (#4197)

[curth]

This is an automated email from the ASF dual-hosted git repository.

curth pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git


The following commit(s) were added to refs/heads/main by this push:
     new 6444fd7cd fix(csharp/src/Drivers): Make AdbcCommandTimeoutProperty to 
optional (#4197)
6444fd7cd is described below

commit 6444fd7cdef405a2e305173c11fcfedeabdfae12
Author: Dan Liu <dandandanliu...@gmail.com>
AuthorDate: Wed Apr 8 22:40:59 2026 +0800

    fix(csharp/src/Drivers): Make AdbcCommandTimeoutProperty to optional (#4197)
    
    Previously, setting CommandTimeout required AdbcCommandTimeoutProperty
    to be set first, throwing InvalidOperationException if it was not,
    specifically in Snowflake's case.
    Now, AdbcCommandTimeoutProperty is nullable and CommandTimeout stores
    the value locally when no driver property is configured, only
    propagating to the driver via SetOption when the property is set.
    Fixed previous PR: https://github.com/apache/arrow-adbc/pull/2312
    
    Co-authored-by: Dan Liu <liud...@microsoft.com>
---
 csharp/src/Client/AdbcCommand.cs                     | 20 +++++++++-----------
 .../Apache.Arrow.Adbc.Tests/Client/ClientTests.cs    |  6 +++---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/csharp/src/Client/AdbcCommand.cs b/csharp/src/Client/AdbcCommand.cs
index 7ad0678af..d87f427c7 100644
--- a/csharp/src/Client/AdbcCommand.cs
+++ b/csharp/src/Client/AdbcCommand.cs
@@ -129,16 +129,12 @@ namespace Apache.Arrow.Adbc.Client
 
         /// <summary>
         /// Gets or sets the name of the command timeout property for the 
underlying ADBC driver.
+        /// When set, <see cref="CommandTimeout"/> will propagate the value to 
the driver via this property.
+        /// When not set, <see cref="CommandTimeout"/> only stores the value 
locally.
         /// </summary>
-        public string AdbcCommandTimeoutProperty
+        public string? AdbcCommandTimeoutProperty
         {
-            get
-            {
-                if (string.IsNullOrEmpty(_commandTimeoutProperty))
-                    throw new 
InvalidOperationException("CommandTimeoutProperty is not set.");
-
-                return _commandTimeoutProperty!;
-            }
+            get => _commandTimeoutProperty;
             set => _commandTimeoutProperty = value;
         }
 
@@ -147,9 +143,11 @@ namespace Apache.Arrow.Adbc.Client
             get => _timeout;
             set
             {
-                // ensures the property exists before setting the 
CommandTimeout value
-                string property = AdbcCommandTimeoutProperty;
-                _adbcStatement.SetOption(property, 
value.ToString(CultureInfo.InvariantCulture));
+                // if the driver property is set, propagate the timeout value 
to the driver
+                if (!string.IsNullOrEmpty(_commandTimeoutProperty))
+                {
+                    _adbcStatement.SetOption(_commandTimeoutProperty!, 
value.ToString(CultureInfo.InvariantCulture));
+                }
                 _timeout = value;
             }
         }
diff --git a/csharp/test/Apache.Arrow.Adbc.Tests/Client/ClientTests.cs 
b/csharp/test/Apache.Arrow.Adbc.Tests/Client/ClientTests.cs
index e1d5a9178..b8afa2626 100644
--- a/csharp/test/Apache.Arrow.Adbc.Tests/Client/ClientTests.cs
+++ b/csharp/test/Apache.Arrow.Adbc.Tests/Client/ClientTests.cs
@@ -221,12 +221,12 @@ namespace Apache.Arrow.Adbc.Tests.Client
 
             if 
(!string.IsNullOrEmpty(connectionStringExample.CommandTimeoutProperty))
             {
-                Assert.True(cmd.AdbcCommandTimeoutProperty == 
connectionStringExample.CommandTimeoutProperty);
-                Assert.True(cmd.CommandTimeout == 
connectionStringExample.CommandTimeout);
+                Assert.Equal(connectionStringExample.CommandTimeoutProperty, 
cmd.AdbcCommandTimeoutProperty);
+                Assert.Equal(connectionStringExample.CommandTimeout, 
cmd.CommandTimeout);
             }
             else
             {
-                Assert.Throws<InvalidOperationException>(() => 
cmd.AdbcCommandTimeoutProperty);
+                Assert.Null(cmd.AdbcCommandTimeoutProperty);
             }
         }
     }