Small enhancement for the ConnectionStringParser to make it more robust.

Additionally made GetDataSource private because its only used inside of the class and #23 added tests for ConnectionStringParser.ExpandDataDirectory.

Author: msallin

SQLite.CodeFirst.Test/SQLite.CodeFirst.Test.csproj

@@ -92,6 +92,7 @@
     <Compile Include="Statement\CreateTableStatementTest.cs" />
     <Compile Include="Statement\CreateIndexStatementCollectionTest.cs" />
     <Compile Include="Statement\ColumnStatementTest.cs" />
+    <Compile Include="Utility\ConnectionStringParserTest.cs" />
     <Compile Include="Utility\HashCreatorTest.cs" />
     <Compile Include="Utility\HistoryEntityTypeValidator.cs" />
   </ItemGroup>

SQLite.CodeFirst.Test/Utility/ConnectionStringParserTest.cs

@@ -0,0 +1,110 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SQLite.CodeFirst.Utility;
+
+namespace SQLite.CodeFirst.Test.Utility
+{
+    [TestClass]
+    public class ConnectionStringParserTest
+    {
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource()
+        {
+            // Arrange
+            string connectionString = @"data source=.\db\footballDb\footballDb.sqlite;foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.AreEqual(@".\db\footballDb\footballDb.sqlite", result);
+        }
+
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource_NotLowerCase()
+        {
+            // Arrange
+            string connectionString = @"DatA SOurce=.\db\footballDb\footballDb.sqlite;foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.AreEqual(@".\db\footballDb\footballDb.sqlite", result);
+        }
+
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource_WithSpace()
+        {
+            // Arrange
+            string connectionString = @"DatA SOurce =.\db\footballDb\footballDb.sqlite;foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.AreEqual(@".\db\footballDb\footballDb.sqlite", result);
+        }
+
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource_ReplacesDataDirectory()
+        {
+            // Arrange
+            string connectionString = @"data source=|DataDirectory|\db\footballDb\footballDb.sqlite;foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.IsTrue(!result.StartsWith("|DataDirectory|"));
+            Assert.IsTrue(result.EndsWith(@"db\footballDb\footballDb.sqlite"));
+        }
+
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource_ReplacesDataDirectoryCaseIsIgnored()
+        {
+            // Arrange
+            string connectionString = @"data source=|dAtadIrectory|\db\footballDb\footballDb.sqlite;foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.IsTrue(!result.StartsWith("|dAtadIrectory|"));
+            Assert.IsTrue(result.EndsWith(@"\db\footballDb\footballDb.sqlite"));
+        }
+
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource_ReplacesDataDirectoryAddsBackslash()
+        {
+            // Arrange
+            string connectionString = @"data source=|DataDirectory|db\footballDb\footballDb.sqlite;foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.IsTrue(!result.StartsWith("|DataDirectory|"));
+            Assert.IsTrue(result.EndsWith(@"\db\footballDb\footballDb.sqlite"));
+        }
+
+        [TestMethod]
+        public void GetDataSource_ReturnsCorrectDataSource_RemovesQuotationMark()
+        {
+            // Arrange
+            string connectionString = @"data source="".\db\footballDb\footballDb.sqlite"";foreign keys=true";
+
+
+            // Act
+            string result = ConnectionStringParser.GetDataSource(connectionString);
+
+            // Assert
+            Assert.AreEqual(@".\db\footballDb\footballDb.sqlite", result);
+        }
+    }
+}

SQLite.CodeFirst/Internal/Utility/ConnectionStringParser.cs

@@ -8,13 +8,22 @@ namespace SQLite.CodeFirst.Utility
     internal static class ConnectionStringParser
     {
         private const string DataDirectoryToken = "|datadirectory|";
+        private const string DataSourceToken = "data source";
         private const char KeyValuePairSeperator = ';';
         private const char KeyValueSeperator = '=';
         private const int KeyPosition = 0;
         private const int ValuePosition = 1;
 
+        public static string GetDataSource(string connectionString)
+        {
+            var path = ExpandDataDirectory(ParseConnectionString(connectionString)[DataSourceToken]);
+            // remove quotation mark if exists
+            path = path.Trim('"');
+            return path;
+        }
+
         [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "ToUppercase makes no sense.")]
-        public static IDictionary<string, string> ParseConnectionString(string connectionString)
+        private static IDictionary<string, string> ParseConnectionString(string connectionString)
         {
             connectionString = connectionString.Trim();
             string[] keyValuePairs = connectionString.Split(KeyValuePairSeperator);
@@ -25,21 +34,13 @@ public static IDictionary<string, string> ParseConnectionString(string connectio
                 string[] keyValue = keyValuePair.Split(KeyValueSeperator);
                 if (keyValue.Length >= 2)
                 {
-                    keyValuePairDictionary.Add(keyValue[KeyPosition].ToLower(CultureInfo.InvariantCulture), keyValue[ValuePosition]);
+                    keyValuePairDictionary.Add(keyValue[KeyPosition].Trim().ToLower(CultureInfo.InvariantCulture), keyValue[ValuePosition]);
                 }
             }
 
             return keyValuePairDictionary;
         }
 
-        public static string GetDataSource(string connectionString)
-        {
-            var path = ExpandDataDirectory(ParseConnectionString(connectionString)["data source"]);
-            // remove quotation mark if exists
-            path = path.Trim('"');
-            return path;
-        }
-
         private static string ExpandDataDirectory(string path)
         {
             if (path == null || !path.StartsWith(DataDirectoryToken, StringComparison.OrdinalIgnoreCase))