Merge pull request #13 from ServiceStack/master

Update from upstream 26.06.2017

Author: OlegNadymov

NuGet.Core/ServiceStack.OrmLite.PostgreSQL.Core/ServiceStack.OrmLite.PostgreSQL.Core.nuspec

@@ -19,7 +19,7 @@
     <copyright>Copyright 2017 ServiceStack</copyright>
     <dependencies>
       <group targetFramework=".NETStandard1.3">
-        <dependency id="Npgsql" version="[3.2.2, )" />
+        <dependency id="Npgsql" version="[3.2.3, )" />
         <dependency id="ServiceStack.Interfaces.Core" version="1.0.0" />
         <dependency id="ServiceStack.Text.Core" version="1.0.0" />
         <dependency id="ServiceStack.Common.Core" version="1.0.0" />

NuGet.Signed/ServiceStack.OrmLite.Sqlite.Windows.Signed/servicestack.ormlite.sqlite.windows.signed.nuspec

@@ -17,7 +17,7 @@
     <language>en-US</language> 
     <copyright>Copyright 2017 ServiceStack</copyright>
     <dependencies>
-      <dependency id="System.Data.SQLite.Core" version="1.0.105.1" />
+      <dependency id="System.Data.SQLite.Core" version="1.0.105.2" />
       <dependency id="ServiceStack.OrmLite.Signed" version="4.5" />
     </dependencies> 
   </metadata> 

NuGet/ServiceStack.OrmLite.PostgreSQL/servicestack.ormlite.postgresql.nuspec

@@ -18,7 +18,7 @@
     <language>en-US</language> 
     <copyright>Copyright 2017 ServiceStack</copyright>
     <dependencies>
-      <dependency id="Npgsql" version="3.2.2" />
+      <dependency id="Npgsql" version="3.2.3" />
       <dependency id="ServiceStack.OrmLite" version="4.5" />
     </dependencies> 
   </metadata> 

NuGet/ServiceStack.OrmLite.Sqlite.Windows/servicestack.ormlite.sqlite.windows.nuspec

@@ -18,7 +18,7 @@
     <language>en-US</language> 
     <copyright>Copyright 2017 ServiceStack</copyright>
     <dependencies>
-      <dependency id="System.Data.SQLite.Core" version="1.0.105.1" />
+      <dependency id="System.Data.SQLite.Core" version="1.0.105.2" />
       <dependency id="ServiceStack.OrmLite" version="4.5" />
     </dependencies> 
   </metadata> 

NuGet/ServiceStack.OrmLite.Sqlite/servicestack.ormlite.sqlite.nuspec

@@ -18,7 +18,7 @@
     <copyright>Copyright 2017 ServiceStack</copyright>
     <dependencies>
       <dependency id="ServiceStack.OrmLite" version="4.5" />
-      <dependency id="System.Data.SQLite.Core" version="1.0.105.1" />
+      <dependency id="System.Data.SQLite.Core" version="1.0.105.2" />
     </dependencies> 
   </metadata> 
   <files>

README.md

@@ -42,8 +42,7 @@ level public properties.
   - [ServiceStack.OrmLite.SqlServer](http://nuget.org/List/Packages/ServiceStack.OrmLite.SqlServer)
   - [ServiceStack.OrmLite.PostgreSQL](http://nuget.org/List/Packages/ServiceStack.OrmLite.PostgreSQL)
   - [ServiceStack.OrmLite.MySql](http://nuget.org/List/Packages/ServiceStack.OrmLite.MySql)
-  - [ServiceStack.OrmLite.Sqlite.Mono](http://nuget.org/packages/ServiceStack.OrmLite.Sqlite.Mono) - Compatible with Mono / Windows (x86) 
-  - [ServiceStack.OrmLite.Sqlite.Windows](http://nuget.org/List/Packages/ServiceStack.OrmLite.Sqlite.Windows) - 32/64bit Mixed mode .NET for Windows only 
+  - [ServiceStack.OrmLite.Sqlite](http://nuget.org/packages/ServiceStack.OrmLite.Sqlite)
   - [ServiceStack.OrmLite.Oracle](http://nuget.org/packages/ServiceStack.OrmLite.Oracle) (unofficial)
   - [ServiceStack.OrmLite.Firebird](http://nuget.org/List/Packages/ServiceStack.OrmLite.Firebird)  (unofficial)
   - [ServiceStack.OrmLite.VistaDb](http://nuget.org/List/Packages/ServiceStack.OrmLite.VistaDb)  (unofficial)
@@ -194,7 +193,7 @@ Currently only a limited number of RDBMS providers offer async API's, which at t
   - [MySQL .NET 4.5+](https://www.nuget.org/packages/ServiceStack.OrmLite.MySql)
 
 We've also added a 
-[.NET 4.5 build for Sqlite](https://www.nuget.org/packages/ServiceStack.OrmLite.Sqlite.Mono) 
+[.NET 4.5 build for Sqlite](https://www.nuget.org/packages/ServiceStack.OrmLite.Sqlite) 
 as it's a common use-case to swapout to use Sqlite's in-memory provider for faster tests. 
 But as Sqlite doesn't provide async API's under-the-hood we fallback to *pseudo async* support where we just wrap its synchronous responses in `Task` results. 
 
@@ -851,11 +850,61 @@ The mapping also includes a fallback for referencing fully-qualified names in th
 
 ## Dynamic Result Sets
 
-There's new support for returning unstructured resultsets letting you Select `List<object>` instead of having results mapped to a concrete Poco class, e.g:
+In addition to populating Typed POCOs, OrmLite has a number of flexible options for accessing dynamic resultsets with adhoc schemas:
+
+### C# 7 Value Tuples
+ 
+The C# 7 Value Tuple support enables a terse, clean and typed API for accessing the Dynamic Result Sets returned when using a custom Select expression:
+
+```csharp
+var query = db.From<Employee>()
+    .Join<Department>()
+    .OrderBy(e => e.Id)
+    .Select<Employee, Department>(
+        (e, d) => new { e.Id, e.LastName, d.Name });
+ 
+var results = db.Select<(int id, string lastName, string deptName)>(query);
+ 
+var row = results[i];
+$"row: ${row.id}, ${row.lastName}, ${row.deptName}".Print();
+```
+ 
+Full Custom SQL Example:
+ 
+```csharp
+var results = db.SqlList<(int count, string min, string max, int sum)>(
+    "SELECT COUNT(*), MIN(Word), MAX(Word), Sum(Total) FROM Table");
+```
+ 
+Partial Custom SQL Select Example:
+ 
+```csharp
+var query = db.From<Table>()
+    .Select("COUNT(*), MIN(Word), MAX(Word), Sum(Total)");
+ 
+var result = db.Single<(int count, string min, string max, int sum)>(query);
+```
+ 
+Same as above, but using Typed APIs:
+ 
+```csharp
+var result = db.Single<(int count, string min, string max, int sum)>(
+    db.From<Table>()
+        .Select(x => new {
+            Count = Sql.Count("*"),
+            Min = Sql.Min(x.Word),
+            Max = Sql.Max(x.Word),
+            Sum = Sql.Sum(x.Total)
+        }));
+```
+
+There's also support for returning unstructured resultsets in `List<object>`, e.g:
 
 ```csharp
-db.Select<List<object>>(db.From<Poco>()
-  .Select("COUNT(*), MIN(Id), MAX(Id)"))[0].PrintDump();
+var results = db.Select<List<object>>(db.From<Poco>()
+  .Select("COUNT(*), MIN(Id), MAX(Id)"));
+
+results[0].PrintDump();
 ```
 
 Output of objects in the returned `List<object>`:
@@ -869,8 +918,10 @@ Output of objects in the returned `List<object>`:
 You can also Select `Dictionary<string,object>` to return a dictionary of column names mapped with their values, e.g:
 
 ```csharp
-db.Select<Dictionary<string,object>>(db.From<Poco>()
-  .Select("COUNT(*) Total, MIN(Id) MinId, MAX(Id) MaxId"))[0].PrintDump();
+var results = db.Select<Dictionary<string,object>>(db.From<Poco>()
+  .Select("COUNT(*) Total, MIN(Id) MinId, MAX(Id) MaxId"));
+
+results[0].PrintDump();
 ```
 
 Output of objects in the returned `Dictionary<string,object>`:
@@ -884,8 +935,8 @@ Output of objects in the returned `Dictionary<string,object>`:
 and can be used for API's returning a **Single** row result:
 
 ```csharp
-db.Single<List<object>>(db.From<Poco>()
-  .Select("COUNT(*) Total, MIN(Id) MinId, MAX(Id) MaxId")).PrintDump();
+var result = db.Single<List<object>>(db.From<Poco>()
+  .Select("COUNT(*) Total, MIN(Id) MinId, MAX(Id) MaxId"));
 ```
 
 or use `object` to fetch an unknown **Scalar** value:
@@ -1896,7 +1947,7 @@ dbFactory.Run(db => db.CreateTable<MasterRecord>(overwrite:false));
 NoOfShards.Times(i => {
     var namedShard = "robots-shard" + i;
     dbFactory.RegisterConnection(namedShard, 
-        "~/App_Data/{0}.sqlite".Fmt(shardId).MapAbsolutePath(),                //Connection String
+        $"~/App_Data/{shardId}.sqlite".MapAbsolutePath(),                //Connection String
         SqliteDialect.Provider);
 
 	dbFactory.OpenDbConnection(namedShard).Run(db => db.CreateTable<Robot>(overwrite:false));
@@ -2316,6 +2367,60 @@ Assert.That(db.Select<Shipper>(), Has.Count.EqualTo(0));
 Assert.That(db.Select<ShipperType>(), Has.Count.EqualTo(0));
 ```
 
+### Soft Deletes
+
+Select Filters let you specify a custom `SelectFilter` that lets you modify queries that use `SqlExpression<T>` before they're executed. This could be used to make working with "Soft Deletes" Tables easier where it can be made to apply a custom `x.IsDeleted != true` condition on every `SqlExpression`.
+
+By either using a `SelectFilter` on concrete POCO Table Types, e.g:
+
+```csharp
+SqlExpression<Table1>.SelectFilter = q => q.Where(x => x.IsDeleted != true);
+SqlExpression<Table2>.SelectFilter = q => q.Where(x => x.IsDeleted != true);
+```
+
+Or alternatively using generic delegate that applies to all SqlExpressions, but you'll only have access to a 
+`IUntypedSqlExpression` which offers a limited API surface area but will still let you execute a custom filter 
+for all `SqlExpression<T>` that could be used to add a condition for all tables implementing a custom 
+`ISoftDelete` interface with:
+
+```csharp
+OrmLiteConfig.SqlExpressionSelectFilter = q =>
+{
+    if (q.ModelDef.ModelType.HasInterface(typeof(ISoftDelete)))
+    {
+        q.Where<ISoftDelete>(x => x.IsDeleted != true);
+    }
+};
+```
+
+Both solutions above will transparently add the `x.IsDeleted != true` to all `SqlExpression<T>` based queries
+so it only returns results which aren't `IsDeleted` from any of queries below:
+
+```csharp
+var results = db.Select(db.From<Table>());
+var result = db.Single(db.From<Table>().Where(x => x.Name == "foo"));
+var result = db.Single(x => x.Name == "foo");
+```
+
+### Check Constraints
+
+OrmLite includes support for [SQL Check Constraints](https://en.wikipedia.org/wiki/Check_constraint) which will create your Table schema with the `[CheckConstraint]` specified, e.g:
+
+```csharp
+public class Table
+{
+    [AutoIncrement]
+    public int Id { get; set; }
+
+    [Required]
+    [CheckConstraint("Age > 1")]
+    public int Age { get; set; }
+
+    [CheckConstraint("Name IS NOT NULL")]
+    public string Name { get; set; }
+}
+```
+
 ## SQL Server Features
 
 ### Memory Optimized Tables

build/copy.bat

@@ -10,18 +10,18 @@ MD ..\..\ServiceStack.OrmLite\NuGet\ServiceStack.OrmLite.T4\content
 
 COPY ..\src\T4\*.*  ..\..\ServiceStack.OrmLite\NuGet\ServiceStack.OrmLite.T4\content
 
-COPY ..\src\ServiceStack.OrmLite\bin\%BUILD%\net45\ServiceStack.OrmLite.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.OrmLite\bin\%BUILD%\net45\ServiceStack.OrmLite.* ..\..\ServiceStack\lib\net45
 COPY ..\src\ServiceStack.OrmLite\bin\%BUILD%\netstandard1.3\ServiceStack.OrmLite.* ..\..\ServiceStack\lib\netstandard1.3
-COPY ..\src\ServiceStack.OrmLite.Sqlite\bin\%BUILD%\net45\ServiceStack.OrmLite.Sqlite.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.OrmLite.Sqlite\bin\%BUILD%\net45\ServiceStack.OrmLite.Sqlite.* ..\..\ServiceStack\lib\net45
 COPY ..\src\ServiceStack.OrmLite.Sqlite\bin\%BUILD%\netstandard1.3\ServiceStack.OrmLite.Sqlite.* ..\..\ServiceStack\lib\netstandard1.3
-COPY ..\src\ServiceStack.OrmLite.Sqlite.Windows\bin\%BUILD%\net45\ServiceStack.OrmLite.Sqlite.Windows.* ..\..\ServiceStack\lib
-COPY ..\src\ServiceStack.OrmLite.SqlServer\bin\%BUILD%\net45\ServiceStack.OrmLite.SqlServer.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.OrmLite.Sqlite.Windows\bin\%BUILD%\net45\ServiceStack.OrmLite.Sqlite.Windows.* ..\..\ServiceStack\lib\net45
+COPY ..\src\ServiceStack.OrmLite.SqlServer\bin\%BUILD%\net45\ServiceStack.OrmLite.SqlServer.* ..\..\ServiceStack\lib\net45
 COPY ..\src\ServiceStack.OrmLite.SqlServer\bin\%BUILD%\netstandard1.3\ServiceStack.OrmLite.SqlServer.* ..\..\ServiceStack\lib\netstandard1.3
-COPY ..\src\ServiceStack.OrmLite.MySql\bin\%BUILD%\net45\ServiceStack.OrmLite.MySql.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.OrmLite.MySql\bin\%BUILD%\net45\ServiceStack.OrmLite.MySql.* ..\..\ServiceStack\lib\net45
 COPY ..\src\ServiceStack.OrmLite.MySql\bin\%BUILD%\netstandard1.6\ServiceStack.OrmLite.MySql.* ..\..\ServiceStack\lib\netstandard1.6
-COPY ..\src\ServiceStack.OrmLite.PostgreSQL\bin\%BUILD%\net45\ServiceStack.OrmLite.PostgreSQL.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.OrmLite.PostgreSQL\bin\%BUILD%\net45\ServiceStack.OrmLite.PostgreSQL.* ..\..\ServiceStack\lib\net45
 COPY ..\src\ServiceStack.OrmLite.PostgreSQL\bin\%BUILD%\netstandard1.3\ServiceStack.OrmLite.PostgreSQL.* ..\..\ServiceStack\lib\netstandard1.3
-COPY ..\src\ServiceStack.OrmLite.PostgreSQL\bin\%BUILD%\net45\Npgsql.* ..\..\ServiceStack\lib
+COPY ..\src\ServiceStack.OrmLite.PostgreSQL\bin\%BUILD%\net45\Npgsql.* ..\..\ServiceStack\lib\net45
 
 COPY ..\src\ServiceStack.OrmLite\bin\Signed\net45\ServiceStack.OrmLite.* ..\..\ServiceStack\lib\signed
 COPY ..\src\ServiceStack.OrmLite.SqlServer\bin\Signed\net45\ServiceStack.OrmLite.SqlServer.* ..\..\ServiceStack\lib\signed