Decision on connection string ambiguity (DNET-892).

Dash supported for host.

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient.Tests/ConnectionStringTests.cs

@@ -719,5 +719,44 @@ public void ParsingDatabaseURLStyleWithoutHostnameDrivePath()
 			Assert.AreEqual("localhost", cs.DataSource);
 			Assert.AreEqual("C:\\test.fdb", cs.Database);
 		}
+
+		[Test]
+		public void ParsingDatabaseNoStyleWithoutPath()
+		{
+			const string ConnectionString = "database=test.fdb";
+			var cs = new ConnectionString(ConnectionString);
+			Assert.AreEqual("test.fdb", cs.Database);
+			Assert.AreEqual(string.Empty, cs.DataSource);
+		}
+
+		[Test]
+		public void ParsingDatabaseNoStyleRootPath()
+		{
+			const string ConnectionString = "database=/test.fdb";
+			var cs = new ConnectionString(ConnectionString);
+			Assert.AreEqual("/test.fdb", cs.Database);
+			Assert.AreEqual(string.Empty, cs.DataSource);
+		}
+
+		[Test]
+		public void ParsingDatabaseNoStyleDrivePath()
+		{
+			const string ConnectionString = "database=C:\\test.fdb";
+			var cs = new ConnectionString(ConnectionString);
+			Assert.AreEqual("C:\\test.fdb", cs.Database);
+			Assert.AreEqual(string.Empty, cs.DataSource);
+		}
+
+		[TestCase("test")]
+		[TestCase("test12")]
+		[TestCase("32test")]
+		[TestCase("test-12")]
+		public void ParsingDatabaseHostnames(string hostname)
+		{
+			var ConnectionString = $"database={hostname}:test.fdb";
+			var cs = new ConnectionString(ConnectionString);
+			Assert.AreEqual(hostname, cs.DataSource);
+			Assert.AreEqual("test.fdb", cs.Database);
+		}
 	}
 }

Provider/src/FirebirdSql.Data.FirebirdClient/Common/ConnectionString.cs

@@ -352,13 +352,14 @@ private void SetDefaultOptions()
 			_options = new Dictionary<string, object>(DefaultValues);
 		}
 
+		// it is expected the hostname do be at least 2 characters to prevent possible ambiguity (DNET-892)
 		private void ParseConnectionInfo(string connectionInfo)
 		{
 			connectionInfo = connectionInfo.Trim();
 
 			{
-				// URL style inet://host:port/database
-				var match = Regex.Match(connectionInfo, "^inet://(?<host>[A-Za-z0-9\\.]+):(?<port>\\d+)/(?<database>.+)$");
+				// URL style inet://[hostv6]:port/database
+				var match = Regex.Match(connectionInfo, "^inet://\\[(?<host>[A-Za-z0-9:]{2,})\\]:(?<port>\\d+)/(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -368,8 +369,8 @@ private void ParseConnectionInfo(string connectionInfo)
 				}
 			}
 			{
-				// URL style inet://[hostv6]:port/database
-				var match = Regex.Match(connectionInfo, "^inet://\\[(?<host>[A-Za-z0-9:]+)\\]:(?<port>\\d+)/(?<database>.+)$");
+				// URL style inet://host:port/database
+				var match = Regex.Match(connectionInfo, "^inet://(?<host>[A-Za-z0-9\\.-]{2,}):(?<port>\\d+)/(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -380,7 +381,7 @@ private void ParseConnectionInfo(string connectionInfo)
 			}
 			{
 				// URL style inet://host/database
-				var match = Regex.Match(connectionInfo, "^inet://(?<host>[A-Za-z0-9\\.:]+)/(?<database>.+)$");
+				var match = Regex.Match(connectionInfo, "^inet://(?<host>[A-Za-z0-9\\.:-]{2,})/(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -399,8 +400,8 @@ private void ParseConnectionInfo(string connectionInfo)
 				}
 			}
 			{
-				// new style //host:port/database
-				var match = Regex.Match(connectionInfo, "^//(?<host>[A-Za-z0-9\\.]+):(?<port>\\d+)/(?<database>.+)$");
+				// new style //[hostv6]:port/database
+				var match = Regex.Match(connectionInfo, "^//\\[(?<host>[A-Za-z0-9:]{2,})\\]:(?<port>\\d+)/(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -410,8 +411,8 @@ private void ParseConnectionInfo(string connectionInfo)
 				}
 			}
 			{
-				// new style //[hostv6]:port/database
-				var match = Regex.Match(connectionInfo, "^//\\[(?<host>[A-Za-z0-9:]+)\\]:(?<port>\\d+)/(?<database>.+)$");
+				// new style //host:port/database
+				var match = Regex.Match(connectionInfo, "^//(?<host>[A-Za-z0-9\\.-]{2,}):(?<port>\\d+)/(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -422,7 +423,7 @@ private void ParseConnectionInfo(string connectionInfo)
 			}
 			{
 				// new style //host/database
-				var match = Regex.Match(connectionInfo, "^//(?<host>[A-Za-z0-9\\.:]+)/(?<database>.+)$");
+				var match = Regex.Match(connectionInfo, "^//(?<host>[A-Za-z0-9\\.:-]{2,})/(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -432,7 +433,7 @@ private void ParseConnectionInfo(string connectionInfo)
 			}
 			{
 				// old style host:X:\database
-				var match = Regex.Match(connectionInfo, "^(?<host>[A-Za-z0-9\\.:]+):(?<database>[A-Za-z]:\\\\.+)$");
+				var match = Regex.Match(connectionInfo, "^(?<host>[A-Za-z0-9\\.:-]{2,}):(?<database>[A-Za-z]:\\\\.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -442,7 +443,7 @@ private void ParseConnectionInfo(string connectionInfo)
 			}
 			{
 				// old style host/port:database
-				var match = Regex.Match(connectionInfo, "^(?<host>[A-Za-z0-9\\.:]+)/(?<port>\\d+):(?<database>.+)$");
+				var match = Regex.Match(connectionInfo, "^(?<host>[A-Za-z0-9\\.:-]{2,})/(?<port>\\d+):(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;
@@ -453,7 +454,7 @@ private void ParseConnectionInfo(string connectionInfo)
 			}
 			{
 				// old style host:database
-				var match = Regex.Match(connectionInfo, "^(?<host>[A-Za-z0-9\\.:]+):(?<database>.+)$");
+				var match = Regex.Match(connectionInfo, "^(?<host>[A-Za-z0-9\\.:-]{2,}):(?<database>.+)$");
 				if (match.Success)
 				{
 					_options[DefaultKeyCatalog] = match.Groups["database"].Value;