Merge pull request #100 from jonkeda/master

msallin · web-flow · commit 5fda890fe5a0 · 2017-10-08T21:56:00.000+02:00
Allow for a missing datasource
diff --git a/SQLite.CodeFirst.Console/Entity/Person.cs b/SQLite.CodeFirst.Console/Entity/Person.cs
@@ -1,4 +1,6 @@
-﻿using System.ComponentModel.DataAnnotations;
+﻿using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace SQLite.CodeFirst.Console.Entity
 {
@@ -18,5 +20,9 @@ public abstract class Person : IEntity
 
         [Required]
         public string City { get; set; }
+
+        [DatabaseGenerated(DatabaseGeneratedOption.Computed)]
+        [SqlDefaultValue(DefaultValue = "DATETIME('now')")]
+        public DateTime CreatedUtc { get; set; }
     }
 }
diff --git a/SQLite.CodeFirst.Console/Program.cs b/SQLite.CodeFirst.Console/Program.cs
@@ -131,6 +131,7 @@ private static void DisplaySeededData(DbContext context)
                     System.Console.WriteLine("\t\t LastName: {0}", player.LastName);
                     System.Console.WriteLine("\t\t Street: {0}", player.Street);
                     System.Console.WriteLine("\t\t City: {0}", player.City);
+                    System.Console.WriteLine("\t\t Created: {0}", player.CreatedUtc);
                     System.Console.WriteLine();
                 }
             }
diff --git a/SQLite.CodeFirst.Test/IntegrationTests/SqlGenerationTest.cs b/SQLite.CodeFirst.Test/IntegrationTests/SqlGenerationTest.cs
@@ -15,8 +15,8 @@ public class SqlGenerationTest
     {
         private const string ReferenceSql =
             @"CREATE TABLE ""MyTable"" ([Id] INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, [Name] nvarchar NOT NULL, FOREIGN KEY (Id) REFERENCES ""Coaches""(Id));
-CREATE TABLE ""Coaches"" ([Id] INTEGER PRIMARY KEY, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL);
-CREATE TABLE ""TeamPlayer"" ([Id] INTEGER PRIMARY KEY, [Number] int NOT NULL, [TeamId] int NOT NULL, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL, [Mentor_Id] int, FOREIGN KEY (Mentor_Id) REFERENCES ""TeamPlayer""(Id), FOREIGN KEY (TeamId) REFERENCES ""MyTable""(Id) ON DELETE CASCADE);
+CREATE TABLE ""Coaches"" ([Id] INTEGER PRIMARY KEY, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL, [CreatedUtc] datetime NOT NULL DEFAULT (DATETIME('now')));
+CREATE TABLE ""TeamPlayer"" ([Id] INTEGER PRIMARY KEY, [Number] int NOT NULL, [TeamId] int NOT NULL, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL, [CreatedUtc] datetime NOT NULL DEFAULT (DATETIME('now')), [Mentor_Id] int, FOREIGN KEY (Mentor_Id) REFERENCES ""TeamPlayer""(Id), FOREIGN KEY (TeamId) REFERENCES ""MyTable""(Id) ON DELETE CASCADE);
 CREATE TABLE ""Stadions"" ([Name] nvarchar (128) NOT NULL, [Street] nvarchar (128) NOT NULL, [City] nvarchar (128) NOT NULL, [Team_Id] int NOT NULL, PRIMARY KEY(Name, Street, City), FOREIGN KEY (Team_Id) REFERENCES ""MyTable""(Id) ON DELETE CASCADE);
 CREATE TABLE ""Foos"" ([FooId] INTEGER PRIMARY KEY, [Name] nvarchar, [FooSelf1Id] int, [FooSelf2Id] int, [FooSelf3Id] int, FOREIGN KEY (FooSelf1Id) REFERENCES ""Foos""(FooId), FOREIGN KEY (FooSelf2Id) REFERENCES ""Foos""(FooId), FOREIGN KEY (FooSelf3Id) REFERENCES ""Foos""(FooId));
 CREATE TABLE ""FooSelves"" ([FooSelfId] INTEGER PRIMARY KEY, [FooId] int NOT NULL, [Number] int NOT NULL, FOREIGN KEY (FooId) REFERENCES ""Foos""(FooId) ON DELETE CASCADE);
@@ -37,11 +37,11 @@ public class SqlGenerationTest
         private static string generatedSql;
 
         // Does not work on the build server. No clue why.
-        [Ignore]
+        
         [TestMethod]
         public void SqliteSqlGeneratorTest()
         {
-            using (DbConnection connection = new SQLiteConnection("data source=:memory:"))
+            using (DbConnection connection = new SQLiteConnection("FullUri=file::memory:"))
             {
                 // This is important! Else the in memory database will not work.
                 connection.Open();
@@ -51,7 +51,7 @@ public void SqliteSqlGeneratorTest()
                     // ReSharper disable once UnusedVariable
                     Player fo = context.Set<Player>().FirstOrDefault();
 
-                    Assert.IsTrue(string.Equals(RemoveLineEndings(ReferenceSql), RemoveLineEndings(generatedSql)));
+                    Assert.AreEqual(RemoveLineEndings(ReferenceSql), RemoveLineEndings(generatedSql));
                 }
             }
         }
diff --git a/SQLite.CodeFirst.Test/SQLite.CodeFirst.Test.csproj b/SQLite.CodeFirst.Test/SQLite.CodeFirst.Test.csproj
@@ -98,6 +98,7 @@
     <Compile Include="UnitTests\Statement\ColumnConstraint\ColumnConstraintCollectionTest.cs" />
     <Compile Include="UnitTests\Statement\ColumnConstraint\NotNullConstraintTest.cs" />
     <Compile Include="UnitTests\Statement\ColumnConstraint\CollateConstraintTest.cs" />
+    <Compile Include="UnitTests\Statement\ColumnConstraint\DefaultValueConstraintTest.cs" />
     <Compile Include="UnitTests\Statement\ColumnConstraint\UniqueConstraintTest.cs" />
     <Compile Include="UnitTests\Statement\ColumnStatementCollectionTest.cs" />
     <Compile Include="UnitTests\Statement\PrimaryKeyStatementTest.cs" />
diff --git a/SQLite.CodeFirst.Test/UnitTests/Statement/ColumnConstraint/DefaultValueConstraintTest.cs b/SQLite.CodeFirst.Test/UnitTests/Statement/ColumnConstraint/DefaultValueConstraintTest.cs
@@ -0,0 +1,36 @@
+﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
+using SQLite.CodeFirst.Statement.ColumnConstraint;
+
+namespace SQLite.CodeFirst.Test.UnitTests.Statement.ColumnConstraint
+{
+    [TestClass]
+    public class DefaultValueConstraintTest
+    {
+        [TestMethod]
+        public void CreateStatement_StatementIsCorrect_IntDefault()
+        {
+            var defaultValueConstraint = new DefaultValueConstraint();
+            defaultValueConstraint.DefaultValue = "0";
+            string output = defaultValueConstraint.CreateStatement();
+            Assert.AreEqual(output, "DEFAULT (0)");
+        }
+
+        [TestMethod]
+        public void CreateStatement_StatementIsCorrect_StringDefault()
+        {
+            var defaultValueConstraint = new DefaultValueConstraint();
+            defaultValueConstraint.DefaultValue = @"'Something'";
+            string output = defaultValueConstraint.CreateStatement();
+            Assert.AreEqual(output, "DEFAULT ('Something')");
+        }
+
+        [TestMethod]
+        public void CreateStatement_StatementIsCorrect_ExpressionDefault()
+        {
+            var defaultValueConstraint = new DefaultValueConstraint();
+            defaultValueConstraint.DefaultValue = @"datetime('now')";
+            string output = defaultValueConstraint.CreateStatement();
+            Assert.AreEqual(output, "DEFAULT (datetime('now'))");
+        }
+    }
+}
diff --git a/SQLite.CodeFirst/Internal/Builder/ColumnStatementCollectionBuilder.cs b/SQLite.CodeFirst/Internal/Builder/ColumnStatementCollectionBuilder.cs
@@ -41,6 +41,7 @@ private IEnumerable<ColumnStatement> CreateColumnStatements()
                 AddUniqueConstraintIfNecessary(property, columnStatement);
                 AddCollationConstraintIfNecessary(property, columnStatement);
                 AddPrimaryKeyConstraintAndAdjustTypeIfNecessary(property, columnStatement);
+                AddDefaultValueConstraintIfNecessary(property, columnStatement);
 
                 yield return columnStatement;
             }
@@ -90,6 +91,15 @@ private static void AddUniqueConstraintIfNecessary(EdmProperty property, ColumnS
             }
         }
 
+        private static void AddDefaultValueConstraintIfNecessary(EdmProperty property, ColumnStatement columnStatement)
+        {
+            var value = property.GetCustomAnnotation<SqlDefaultValueAttribute>();
+            if (value != null)
+            {
+                columnStatement.ColumnConstraints.Add(new DefaultValueConstraint { DefaultValue = value.DefaultValue });
+            }
+        }
+
         private void AddPrimaryKeyConstraintAndAdjustTypeIfNecessary(EdmProperty property, ColumnStatement columnStatement)
         {
             // Only handle a single primary key this way.
diff --git a/SQLite.CodeFirst/Internal/Statement/ColumnConstraint/DefaultValueConstraint.cs b/SQLite.CodeFirst/Internal/Statement/ColumnConstraint/DefaultValueConstraint.cs
@@ -0,0 +1,20 @@
+﻿using System.Text;
+
+namespace SQLite.CodeFirst.Statement.ColumnConstraint
+{
+    internal class DefaultValueConstraint : IColumnConstraint
+    {
+        private const string Template = "DEFAULT ({defaultValue})";
+
+        public string DefaultValue { get; set; }
+
+        public string CreateStatement()
+        {
+            var sb = new StringBuilder(Template);
+
+            sb.Replace("{defaultValue}", DefaultValue);
+
+            return sb.ToString().Trim();
+        }
+    }
+}
diff --git a/SQLite.CodeFirst/Internal/Utility/ConnectionStringParser.cs b/SQLite.CodeFirst/Internal/Utility/ConnectionStringParser.cs
@@ -17,10 +17,20 @@ internal static class ConnectionStringParser
 
         public static string GetDataSource(string connectionString)
         {
-            var path = ExpandDataDirectory(ParseConnectionString(connectionString)[DataSourceToken]);
-            // remove quotation mark if exists
-            path = path.Trim('"');
-            return path;
+            // If the datasource token does not exists this is a FullUri connection string.
+            IDictionary<string, string> strings = ParseConnectionString(connectionString);
+            if (strings.ContainsKey(DataSourceToken))
+            {
+                var path = ExpandDataDirectory(ParseConnectionString(connectionString)[DataSourceToken]);
+                // remove quotation mark if exists
+                return path.Trim('"');
+            }
+            // TODO: Implement FullUri parsing.
+            if (connectionString.Contains(":memory:")) 
+            {
+                return ":memory:";
+            }
+            throw new NotSupportedException("FullUri format is currently only supported for :memory:.");
         }
 
         [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "ToUppercase makes no sense.")]
diff --git a/SQLite.CodeFirst/Internal/Utility/InMemoryAwareFile.cs b/SQLite.CodeFirst/Internal/Utility/InMemoryAwareFile.cs
@@ -52,7 +52,9 @@ public static void CreateDirectory(string path)
 
         private static bool IsInMemoryPath(string path)
         {
-            return string.Equals(path, ":memory:", StringComparison.OrdinalIgnoreCase);
+            // If the path doesn't exists then the datasource was empty as probably a FullUri was specified instead.
+            return string.IsNullOrEmpty(path)
+                   || string.Equals(path, ":memory:", StringComparison.OrdinalIgnoreCase);
         }
     }
 }
diff --git a/SQLite.CodeFirst/Public/Attributes/SqlDefaultValueAttribute.cs b/SQLite.CodeFirst/Public/Attributes/SqlDefaultValueAttribute.cs
@@ -0,0 +1,16 @@
+﻿using System;
+
+namespace SQLite.CodeFirst
+{
+    /// <summary>
+    /// Decorate an column with this attribute to create a "DEFAULT {defaultvalue}".
+    /// <remarks>
+    /// https://www.sqlite.org/lang_createtable.html [05.10.2017]
+    /// </remarks>
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public sealed class SqlDefaultValueAttribute : Attribute
+    {
+        public string DefaultValue { get; set; }
+    }
+}
diff --git a/SQLite.CodeFirst/Public/DbInitializers/SqliteInitializerBase.cs b/SQLite.CodeFirst/Public/DbInitializers/SqliteInitializerBase.cs
@@ -43,6 +43,7 @@ protected SqliteInitializerBase(DbModelBuilder modelBuilder)
             modelBuilder.RegisterAttributeAsColumnAnnotation<UniqueAttribute>();
             modelBuilder.RegisterAttributeAsColumnAnnotation<CollateAttribute>();
             modelBuilder.RegisterAttributeAsColumnAnnotation<AutoincrementAttribute>();
+            modelBuilder.RegisterAttributeAsColumnAnnotation<SqlDefaultValueAttribute>();
 
             // By default there is a 'ForeignKeyIndexConvention' but it can be removed.
             // And there is no "Contains" and no way to enumerate the ConventionsCollection.
diff --git a/SQLite.CodeFirst/SQLite.CodeFirst.csproj b/SQLite.CodeFirst/SQLite.CodeFirst.csproj
@@ -88,13 +88,15 @@
       <Link>Properties\AssemblySharedInfo.cs</Link>
     </Compile>
     <Compile Include="Internal\Builder\NameCreators\NameCreator.cs" />
+    <Compile Include="Internal\Statement\ColumnConstraint\DefaultValueConstraint.cs" />
     <Compile Include="Internal\Utility\InMemoryAwareFile.cs" />
     <Compile Include="Internal\Extensions\ListExtensions.cs" />
     <Compile Include="Internal\Statement\ColumnConstraint\PrimaryKeyConstraint.cs" />
     <Compile Include="Public\Attributes\AutoincrementAttribute.cs" />
     <Compile Include="Public\Attributes\CollateAttribute.cs" />
     <Compile Include="Public\Attributes\CollationFunction.cs" />
     <Compile Include="Public\Attributes\OnConflictAction.cs" />
+    <Compile Include="Public\Attributes\SqlDefaultValueAttribute.cs" />
     <Compile Include="Public\Attributes\UniqueAttribute.cs" />
     <Compile Include="Public\Entities\IHistory.cs" />
     <Compile Include="Internal\Builder\NameCreators\IndexNameCreator.cs" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using System.ComponentModel.DataAnnotations;`
	`1`	`+using System;`
	`2`	`+using System.ComponentModel.DataAnnotations;`
	`3`	`+using System.ComponentModel.DataAnnotations.Schema;`
`2`	`4`
`3`	`5`	`namespace SQLite.CodeFirst.Console.Entity`
`4`	`6`	`{`
`@@ -18,5 +20,9 @@ public abstract class Person : IEntity`
`18`	`20`
`19`	`21`	`[Required]`
`20`	`22`	`public string City { get; set; }`
	`23`	`+`
	`24`	`+ [DatabaseGenerated(DatabaseGeneratedOption.Computed)]`
	`25`	`+ [SqlDefaultValue(DefaultValue = "DATETIME('now')")]`
	`26`	`+ public DateTime CreatedUtc { get; set; }`
`21`	`27`	`}`
`22`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ private static void DisplaySeededData(DbContext context)`
`131`	`131`	`System.Console.WriteLine("\t\t LastName: {0}", player.LastName);`
`132`	`132`	`System.Console.WriteLine("\t\t Street: {0}", player.Street);`
`133`	`133`	`System.Console.WriteLine("\t\t City: {0}", player.City);`
	`134`	`+ System.Console.WriteLine("\t\t Created: {0}", player.CreatedUtc);`
`134`	`135`	`System.Console.WriteLine();`
`135`	`136`	`}`
`136`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ public class SqlGenerationTest`
`15`	`15`	`{`
`16`	`16`	`private const string ReferenceSql =`
`17`	`17`	`@"CREATE TABLE ""MyTable"" ([Id] INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, [Name] nvarchar NOT NULL, FOREIGN KEY (Id) REFERENCES ""Coaches""(Id));`
`18`		`-CREATE TABLE ""Coaches"" ([Id] INTEGER PRIMARY KEY, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL);`
`19`		`-CREATE TABLE ""TeamPlayer"" ([Id] INTEGER PRIMARY KEY, [Number] int NOT NULL, [TeamId] int NOT NULL, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL, [Mentor_Id] int, FOREIGN KEY (Mentor_Id) REFERENCES ""TeamPlayer""(Id), FOREIGN KEY (TeamId) REFERENCES ""MyTable""(Id) ON DELETE CASCADE);`
	`18`	`+CREATE TABLE ""Coaches"" ([Id] INTEGER PRIMARY KEY, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL, [CreatedUtc] datetime NOT NULL DEFAULT (DATETIME('now')));`
	`19`	`+CREATE TABLE ""TeamPlayer"" ([Id] INTEGER PRIMARY KEY, [Number] int NOT NULL, [TeamId] int NOT NULL, [FirstName] nvarchar (50) COLLATE NOCASE, [LastName] nvarchar (50), [Street] nvarchar (100), [City] nvarchar NOT NULL, [CreatedUtc] datetime NOT NULL DEFAULT (DATETIME('now')), [Mentor_Id] int, FOREIGN KEY (Mentor_Id) REFERENCES ""TeamPlayer""(Id), FOREIGN KEY (TeamId) REFERENCES ""MyTable""(Id) ON DELETE CASCADE);`
`20`	`20`	`CREATE TABLE ""Stadions"" ([Name] nvarchar (128) NOT NULL, [Street] nvarchar (128) NOT NULL, [City] nvarchar (128) NOT NULL, [Team_Id] int NOT NULL, PRIMARY KEY(Name, Street, City), FOREIGN KEY (Team_Id) REFERENCES ""MyTable""(Id) ON DELETE CASCADE);`
`21`	`21`	`CREATE TABLE ""Foos"" ([FooId] INTEGER PRIMARY KEY, [Name] nvarchar, [FooSelf1Id] int, [FooSelf2Id] int, [FooSelf3Id] int, FOREIGN KEY (FooSelf1Id) REFERENCES ""Foos""(FooId), FOREIGN KEY (FooSelf2Id) REFERENCES ""Foos""(FooId), FOREIGN KEY (FooSelf3Id) REFERENCES ""Foos""(FooId));`
`22`	`22`	`CREATE TABLE ""FooSelves"" ([FooSelfId] INTEGER PRIMARY KEY, [FooId] int NOT NULL, [Number] int NOT NULL, FOREIGN KEY (FooId) REFERENCES ""Foos""(FooId) ON DELETE CASCADE);`
`@@ -37,11 +37,11 @@ public class SqlGenerationTest`
`37`	`37`	`private static string generatedSql;`
`38`	`38`
`39`	`39`	`// Does not work on the build server. No clue why.`
`40`		`- [Ignore]`
	`40`	`+`
`41`	`41`	`[TestMethod]`
`42`	`42`	`public void SqliteSqlGeneratorTest()`
`43`	`43`	`{`
`44`		`- using (DbConnection connection = new SQLiteConnection("data source=:memory:"))`
	`44`	`+ using (DbConnection connection = new SQLiteConnection("FullUri=file::memory:"))`
`45`	`45`	`{`
`46`	`46`	`// This is important! Else the in memory database will not work.`
`47`	`47`	`connection.Open();`
`@@ -51,7 +51,7 @@ public void SqliteSqlGeneratorTest()`
`51`	`51`	`// ReSharper disable once UnusedVariable`
`52`	`52`	`Player fo = context.Set<Player>().FirstOrDefault();`
`53`	`53`
`54`		`- Assert.IsTrue(string.Equals(RemoveLineEndings(ReferenceSql), RemoveLineEndings(generatedSql)));`
	`54`	`+ Assert.AreEqual(RemoveLineEndings(ReferenceSql), RemoveLineEndings(generatedSql));`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ private IEnumerable<ColumnStatement> CreateColumnStatements()`
`41`	`41`	`AddUniqueConstraintIfNecessary(property, columnStatement);`
`42`	`42`	`AddCollationConstraintIfNecessary(property, columnStatement);`
`43`	`43`	`AddPrimaryKeyConstraintAndAdjustTypeIfNecessary(property, columnStatement);`
	`44`	`+ AddDefaultValueConstraintIfNecessary(property, columnStatement);`
`44`	`45`
`45`	`46`	`yield return columnStatement;`
`46`	`47`	`}`
`@@ -90,6 +91,15 @@ private static void AddUniqueConstraintIfNecessary(EdmProperty property, ColumnS`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`
	`94`	`+ private static void AddDefaultValueConstraintIfNecessary(EdmProperty property, ColumnStatement columnStatement)`
	`95`	`+ {`
	`96`	`+ var value = property.GetCustomAnnotation<SqlDefaultValueAttribute>();`
	`97`	`+ if (value != null)`
	`98`	`+ {`
	`99`	`+ columnStatement.ColumnConstraints.Add(new DefaultValueConstraint { DefaultValue = value.DefaultValue });`
	`100`	`+ }`
	`101`	`+ }`
	`102`	`+`
`93`	`103`	`private void AddPrimaryKeyConstraintAndAdjustTypeIfNecessary(EdmProperty property, ColumnStatement columnStatement)`
`94`	`104`	`{`
`95`	`105`	`// Only handle a single primary key this way.`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ public static void CreateDirectory(string path)`
`52`	`52`
`53`	`53`	`private static bool IsInMemoryPath(string path)`
`54`	`54`	`{`
`55`		`- return string.Equals(path, ":memory:", StringComparison.OrdinalIgnoreCase);`
	`55`	`+ // If the path doesn't exists then the datasource was empty as probably a FullUri was specified instead.`
	`56`	`+ return string.IsNullOrEmpty(path)`
	`57`	`+ \|\| string.Equals(path, ":memory:", StringComparison.OrdinalIgnoreCase);`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`	`}`