Changed according to comments

snowflakedb · Jan 12, 2024 · b771acb · b771acb
1 parent 3c9b728
commit b771acb
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/Snowflake.Data/Core/Session/SFSessionProperty.cs b/Snowflake.Data/Core/Session/SFSessionProperty.cs
@@ -258,18 +258,7 @@ internal static SFSessionProperties parseConnectionString(String connectionStrin
             ValidateFileTransferMaxBytesInMemoryProperty(properties);
             ValidateAccountDomain(properties);
 
-            var allowUnderscoresInHost = bool.Parse(SFSessionProperty.ALLOWUNDERSCORESINHOST.GetAttribute<SFSessionPropertyAttr>().defaultValue);
-            if (properties.ContainsKey(SFSessionProperty.ALLOWUNDERSCORESINHOST))
-            {
-                try
-                {
-                    allowUnderscoresInHost = bool.Parse(properties[SFSessionProperty.ALLOWUNDERSCORESINHOST]);
-                }
-                catch (Exception e)
-                {
-                    logger.Warn("Unable to parse property 'allowUnderscoresInHost'", e);
-                }
-            }
+            var allowUnderscoresInHost = ParseAllowUnderscoresInHost(properties);
 
             // compose host value if not specified
             if (!properties.ContainsKey(SFSessionProperty.HOST) ||
@@ -399,6 +388,23 @@ private static bool IsRequired(SFSessionProperty sessionProperty, SFSessionPrope
                 return sessionProperty.GetAttribute<SFSessionPropertyAttr>().required;
             }
         }
+
+        private static bool ParseAllowUnderscoresInHost(SFSessionProperties properties)
+        {
+            var allowUnderscoresInHost = bool.Parse(SFSessionProperty.ALLOWUNDERSCORESINHOST.GetAttribute<SFSessionPropertyAttr>().defaultValue);
+            if (!properties.TryGetValue(SFSessionProperty.ALLOWUNDERSCORESINHOST, out var property))
+                return allowUnderscoresInHost;
+            try
+            {
+                allowUnderscoresInHost = bool.Parse(property);
+            }
+            catch (Exception e)
+            {
+                logger.Warn("Unable to parse property 'allowUnderscoresInHost'", e);
+            }
+
+            return allowUnderscoresInHost;
+        }
     }
 
     public static class EnumExtensions