Merge pull request #2 from ServiceStack/master

Merge from upsteam branch 29.07.2016

Author: OlegNadymov

README.md

@@ -1245,11 +1245,11 @@ using (var db = OpenDbConnection())
 }
 ```
 
-Results filters makes it trivial to implement the `CaptureSqlFilter` which allows you to capture SQL Statements without running them, e.g:
-
 ### CaptureSqlFilter
 
-[CaptureSqlFilter](https://github.com/ServiceStack/ServiceStack.OrmLite/blob/4c56bde197d07cfc78a80be06dd557732ecf68fa/src/ServiceStack.OrmLite/OrmLiteResultsFilter.cs#L321) is an simple Results Filter which can be used to quickly found out what SQL your DB calls generate by surrounding DB access in a using scope like:
+Results filters makes it trivial to implement the `CaptureSqlFilter` which allows you to capture SQL Statements without running them.
+[CaptureSqlFilter](https://github.com/ServiceStack/ServiceStack.OrmLite/blob/4c56bde197d07cfc78a80be06dd557732ecf68fa/src/ServiceStack.OrmLite/OrmLiteResultsFilter.cs#L321) 
+is just a simple Results Filter which can be used to quickly found out what SQL your DB calls generate by surrounding DB access in a using scope, e.g:
 
 ```csharp
 using (var captured = new CaptureSqlFilter())

lib/ServiceStack.Client.dll

@@ -104,6 +104,7 @@
     <Compile Include="SqlServerExpression.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SqlServerOrmLiteDialectProvider.cs" />
+    <Compile Include="SqlServerTableHint.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj">

lib/ServiceStack.Common.dll

@@ -1,5 +1,6 @@
 using System;
 using System.Data;
+using System.Linq.Expressions;
 using System.Text;
 using ServiceStack.OrmLite.SqlServer.Converters;
 using ServiceStack.Text;

src/ServiceStack.OrmLite.SqlServer/ServiceStack.OrmLite.SqlServer.csproj

@@ -0,0 +1,11 @@
+namespace ServiceStack.OrmLite.SqlServer
+{
+    public class SqlServerTableHint
+    {
+        public static JoinFormatDelegate ReadUncommitted = (dialect, tableDef, expr) => "{0} WITH (READUNCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate ReadCommitted = (dialect, tableDef, expr) => "{0} WITH (READCOMMITTED) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate ReadPast = (dialect, tableDef, expr) => "{0} WITH (READPAST) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate Serializable = (dialect, tableDef, expr) => "{0} WITH (SERIALIZABLE) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+        public static JoinFormatDelegate RepeatableRead = (dialect, tableDef, expr) => "{0} WITH (REPEATABLEREAD) {1}".Fmt(dialect.GetQuotedTableName(tableDef), expr);
+    }
+}

src/ServiceStack.OrmLite.SqlServer/SqlServerExpression.cs

@@ -119,6 +119,7 @@
     <Compile Include="UpdateTests.cs" />
     <Compile Include="UseCase\ComplexJoinWithLimitAndNoOrderByTests.cs" />
     <Compile Include="UseCase\ComplexJoinWithLimitAndSpacesInAliasesTests.cs" />
+    <Compile Include="UseCase\JoinWithHintUseCase.cs" />
     <Compile Include="UseCase\TestEntityWithAliases.cs" />
     <Compile Include="UseCase\SimpleUseCase.cs" />
     <Compile Include="UseCase\TestEntity.cs" />

src/ServiceStack.OrmLite.SqlServer/SqlServerTableHint.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.OrmLite.SqlServer;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.SqlServerTests.UseCase
+{
+    [TestFixture]
+    public class JoinWithHintUseCase : OrmLiteTestBase
+    {
+        [Alias("car")]
+        class Car
+        {
+
+            [PrimaryKey]
+            [Alias("car_id")]
+            [AutoIncrement]
+            public int CarId { get; set; }
+
+            [Alias("car_name")]
+            public string Name { get; set; }
+        }
+
+        [Alias("car_type")]
+        class CarType
+        {
+            [Alias("car_id")]
+            public int CarId { get; set; }
+
+            [Alias("car_type_name")]
+            public string CarTypeName { get; set; }
+        }
+
+        class CarTypeJoin
+        {
+            public int CarId { get; set; }
+            public string CarTypeName { get; set; }
+        }
+
+        private static void InitTables(IDbConnection db)
+        {
+            db.DropTable<Car>();
+            db.DropTable<CarType>();
+
+            db.CreateTable<Car>();
+            db.CreateTable<CarType>();
+
+
+            var id1 = db.Insert(new Car { Name = "Subaru" }, true);
+            var id2 = db.Insert(new Car { Name = "BMW" }, true);
+            var id3 = db.Insert(new Car { Name = "Nissan" }, true);
+
+            db.Insert(new CarType { CarId = (int)id1, CarTypeName = "Sedan" });
+            db.Insert(new CarType { CarId = (int)id2, CarTypeName = "Coupe" });
+            db.Insert(new CarType { CarId = (int)id3, CarTypeName = "SUV" });
+        }
+
+        [Test]
+        public void can_join_with_readuncommitted()
+        {
+            using (var db = OpenDbConnection())
+            {
+                InitTables(db);
+
+                var join = db.From<Car>()
+                    .Join<Car, CarType>((l, r) => l.CarId == r.CarId, SqlServerTableHint.ReadUncommitted);
+
+                var selectStatement = join.ToSelectStatement();
+                selectStatement.Print();
+
+                var data = db.Select<CarTypeJoin>(join);
+
+                Assert.That(selectStatement.Contains("READUNCOMMITTED"));
+            }
+        }
+    }
+}

src/ServiceStack.OrmLite.SqlServerTests/ServiceStack.OrmLite.SqlServerTests.csproj

@@ -50,7 +50,7 @@ protected override object VisitSqlMethodCall(MethodCallExpression m)
                     statement = string.Format("{0} DESC", quotedColName);
                     break;
                 case "As":
-                    statement = string.Format("{0} As {1}", quotedColName,
+                    statement = string.Format("{0} AS {1}", quotedColName,
                         base.DialectProvider.GetQuotedColumnName(RemoveQuoteFromAlias(args[0].ToString())));
                     break;
                 case "Sum":
@@ -67,7 +67,7 @@ protected override object VisitSqlMethodCall(MethodCallExpression m)
                     statement = string.Format("COUNT(DISTINCT {0})", quotedColName);
                     break;
                 default:
-                    throw new NotSupportedException();
+                    return base.VisitSqlMethodCall(m);
             }
 
             return new PartialSqlString(statement);

src/ServiceStack.OrmLite.SqlServerTests/UseCase/JoinWithHintUseCase.cs

@@ -102,6 +102,16 @@ public static string Avg(string value)
         {
             return "AVG({0})".Fmt(value);
         }
+
+        public static T AllFields<T>(T item)
+        {
+            return item;
+        }
+
+        public static string JoinAlias<T>(T property, string tableAlias)
+        {
+            return tableAlias;
+        }
     }
 
 }