Merge branch 'master' into mgemra/SNOW-2026116-remove-mono-unix

Author: sfc-gh-mgemra

CHANGELOG.md

@@ -4,6 +4,7 @@
 - v5.2.0
     - Added multi-targeting support. The appropriate build is selected by NuGet based on target framework and OS.
     - Fixed CRL validation to reject newly downloaded CRLs if their NextUpdate has already expired.
+    - Users can now specify non-string values in Toml. For example, `port` can be specified as an integer in the Toml.
 - v5.1.0
     - Added `APPLICATION_PATH` to `CLIENT_ENVIRONMENT` sent during authentication to identify the application connecting to Snowflake.
     - Renew idle sessions in the pool if keep alive is enabled.
@@ -19,4 +20,3 @@
     - Added the `changelog.yml` GitHub workflow to ensure changelog is updated on release PRs.
     - Removed internal classes from public API.
     - Added support for explicitly setting Azure managed identity client ID via `MANAGED_IDENTITY_CLIENT_ID` environmen
-

Snowflake.Data.Tests/UnitTests/SnowflakeTomlConnectionBuilderTest.cs

@@ -506,6 +506,57 @@ public void TestConnectionMapPropertiesWithSpecialCharacters(string passwordValu
             // Assert
             Assert.AreEqual(expectedValue, properties[SFSessionProperty.PASSWORD]);
         }
+
+        [Test]
+        public void TestConnectionWithCompleteSPCSConfiguration()
+        {
+            // Arrange
+            var tokenFilePath = "/path/to/token";
+            var testToken = "oauth_token_12345";
+            var mockFileOperations = new Mock<FileOperations>();
+            var mockEnvironmentOperations = new Mock<EnvironmentOperations>();
+            mockEnvironmentOperations.Setup(e => e.GetFolderPath(Environment.SpecialFolder.UserProfile))
+                .Returns($"{Path.DirectorySeparatorChar}home");
+            mockFileOperations.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
+            mockFileOperations.Setup(f => f.ReadAllText(tokenFilePath, It.IsAny<Action<UnixStream>>())).Returns(testToken);
+            mockFileOperations.Setup(f => f.ReadAllText(It.Is<string>(p => p.Contains(".snowflake")), It.IsAny<Action<UnixStream>>()))
+                .Returns(@$"
+[default]
+host = 'host.snowflake.com'
+protocol = 'http'
+port = 80
+account = 'account123'
+database = 'testdb'
+schema = 'testschema'
+warehouse = 'testwh'
+authenticator = 'oauth'
+token_file_path = '{tokenFilePath}'
+client_session_keep_alive = true
+ocsp_fail_open = true
+disable_ocsp_check = true
+");
+
+            var reader = new TomlConnectionBuilder(mockFileOperations.Object, mockEnvironmentOperations.Object);
+
+            // Act
+            var connectionString = reader.GetConnectionStringFromToml();
+            var properties = SFSessionProperties.ParseConnectionString(connectionString, new SessionPropertiesContext());
+
+            // Assert
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual("host.snowflake.com", properties[SFSessionProperty.HOST]);
+                Assert.AreEqual("http", properties[SFSessionProperty.SCHEME]);
+                Assert.AreEqual("80", properties[SFSessionProperty.PORT]);
+                Assert.AreEqual("account123", properties[SFSessionProperty.ACCOUNT]);
+                Assert.AreEqual("testdb", properties[SFSessionProperty.DB]);
+                Assert.AreEqual("testschema", properties[SFSessionProperty.SCHEMA]);
+                Assert.AreEqual("testwh", properties[SFSessionProperty.WAREHOUSE]);
+                Assert.AreEqual("oauth", properties[SFSessionProperty.AUTHENTICATOR]);
+                Assert.AreEqual(testToken, properties[SFSessionProperty.TOKEN]);
+                Assert.AreEqual("true", properties[SFSessionProperty.CLIENT_SESSION_KEEP_ALIVE]);
+            });
+        }
     }
 
 }

Snowflake.Data/Core/TomlConnectionBuilder.cs

@@ -29,7 +29,8 @@ internal class TomlConnectionBuilder
 
         private readonly Dictionary<string, string> _tomlToNetPropertiesMapper = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase)
         {
-            { "DATABASE", "DB" }
+            { "DATABASE", "DB" },
+            { "PROTOCOL", "SCHEME" }
         };
 
         private readonly FileOperations _fileOperations;
@@ -64,7 +65,7 @@ private string GetConnectionStringFromTomlTable(TomlTable connectionToml)
             var isOauth = connectionToml.TryGetValue("authenticator", out var authenticator) && OAuthAuthenticator.IsOAuthAuthenticator(authenticator.ToString());
             foreach (var property in connectionToml.Keys)
             {
-                var propertyValue = (string)connectionToml[property];
+                var propertyValue = ConvertTomlValueToString(connectionToml[property]);
                 if (isOauth && property.Equals("token_file_path", StringComparison.InvariantCultureIgnoreCase))
                 {
                     tokenFilePathValue = propertyValue;
@@ -78,6 +79,15 @@ private string GetConnectionStringFromTomlTable(TomlTable connectionToml)
             return connectionStringBuilder.ToString();
         }
 
+        private string ConvertTomlValueToString(object value)
+        {
+            if (value is bool boolValue)
+            {
+                return boolValue.ToString().ToLower();
+            }
+            return value?.ToString() ?? string.Empty;
+        }
+
         private void AppendTokenFromFileIfNotGivenExplicitly(TomlTable connectionToml, bool isOauth,
             StringBuilder connectionStringBuilder, string tokenFilePathValue)
         {