DNET-600

FirebirdSQL · Apr 9, 2015 · de1bb66 · de1bb66
1 parent 8ca6f26
commit de1bb66
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/NETProvider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionString.cs b/NETProvider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionString.cs
@@ -290,7 +290,7 @@ internal FbConnectionString(bool isServiceConnectionString)
 
 		public void Load(string connectionString)
 		{
-			const string KeyPairsRegex = "(([\\w\\s\\d]*)\\s*?=\\s*?\"([^\"]*)\"|([\\w\\s\\d]*)\\s*?=\\s*?'([^']*)'|([\\w\\s\\d]*)\\s*?=\\s*?([^\"'][^;]*))";
+			const string KeyPairsRegex = "(([\\w\\s\\d]*)\\s*?=\\s*?\"([^\"]*)\"|([\\w\\s\\d]*)\\s*?=\\s*?'([^']*)'|([\\w\\s\\d]*)\\s*?=\\s*?([^\"';][^;]*))";
 
 			this.SetDefaultOptions();
 

diff --git a/NETProvider/src/FirebirdSql.Data.UnitTests/FbConnectionStringTests.cs b/NETProvider/src/FirebirdSql.Data.UnitTests/FbConnectionStringTests.cs
@@ -135,5 +135,23 @@ public void NormalizedConnectionStringIgnoresCultureTest()
 
 			Assert.AreEqual(s1, s2);
 		}
+
+		[Test]
+		public void ParsingWithEmptyKeyConnectionStringTest()
+		{
+			const string ConnectionString = "user=;password=testpwd";
+			var cs = new FbConnectionString(ConnectionString);
+			Assert.AreEqual("", cs.UserID);
+			Assert.AreEqual("testpwd", cs.Password);
+		}
+
+		[Test]
+		public void ParsingWithWhiteSpacesKeyConnectionStringTest()
+		{
+			const string ConnectionString = "user= \t;password=testpwd";
+			var cs = new FbConnectionString(ConnectionString);
+			Assert.AreEqual("", cs.UserID);
+			Assert.AreEqual("testpwd", cs.Password);
+		}
 	}
 }
diff --git a/NETProvider/src/FirebirdSql.Data.UnitTests/TrackerIssuesTests.cs b/NETProvider/src/FirebirdSql.Data.UnitTests/TrackerIssuesTests.cs
@@ -264,6 +264,21 @@ public void DNET274()
 			}
 		}
 
+		[Test]
+		public void DNET()
+		{
+			const string ConnectionString = @"data source=localhost;port number=20455;initial catalog=;user id=SYSDBA;password=masterkey;pooling=False;packet size=16384;character set=UTF8";
+			var cs = new FbConnectionString(ConnectionString);
+			Assert.AreEqual("localhost", cs.DataSource);
+			Assert.AreEqual(20455, cs.Port);
+			Assert.AreEqual(string.Empty, cs.Database);
+			Assert.AreEqual("SYSDBA", cs.UserID);
+			Assert.AreEqual("masterkey", cs.Password);
+			Assert.AreEqual(false, cs.Pooling);
+			Assert.AreEqual(16384, cs.PacketSize);
+			Assert.AreEqual("UTF8", cs.Charset);
+		}
+
 		#endregion
 	}
 }