Merge pull request #3 from ServiceStack/master

Merge from upsteam branch 01.08.2016

Author: OlegNadymov

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

@@ -110,6 +110,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">

src/ServiceStack.OrmLite.Sqlite/SqliteExpression.cs

@@ -80,7 +80,7 @@ public override SqlExpression<T> OrderByRandom()
 
         protected override PartialSqlString ToConcatPartialString(List<Object> args)
         {
-            ;return new PartialSqlString(String.Join(" || ", args));
+            return new PartialSqlString(String.Join(" || ", args));
         }
     }
-}
+}

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -1720,8 +1720,12 @@ private object GetNotValue(object o)
 
         private bool IsColumnAccess(MethodCallExpression m)
         {
-            if (m.Object != null && m.Object as MethodCallExpression != null)
-                return IsColumnAccess(m.Object as MethodCallExpression);
+            if (m.Object == null)
+                return false;
+            
+            var methCallExp = m.Object as MethodCallExpression;
+            if (methCallExp != null)
+                return IsColumnAccess(methCallExp);
 
             var exp = m.Object as MemberExpression;
             return IsParameterAccess(exp)
@@ -1930,14 +1934,11 @@ public IList<string> GetAllFields()
             return modelDef.FieldDefinitions.ConvertAll(r => r.Name);
         }
 
-        private bool IsStaticArrayMethod(MethodCallExpression m)
+        private static bool IsStaticArrayMethod(MethodCallExpression m)
         {
-            if (m.Object == null && m.Method.Name == "Contains")
-            {
-                return m.Arguments.Count == 2;
-            }
-
-            return false;
+            return (m.Object == null 
+                && m.Method.Name == "Contains"
+                && m.Arguments.Count == 2);
         }
 
         protected virtual object VisitStaticArrayMethodCall(MethodCallExpression m)
@@ -1959,17 +1960,13 @@ protected virtual object VisitStaticArrayMethodCall(MethodCallExpression m)
             }
         }
 
-        private bool IsEnumerableMethod(MethodCallExpression m)
+        private static bool IsEnumerableMethod(MethodCallExpression m)
         {
-            if (m.Object != null
+            return (m.Object != null
                 && m.Object.Type.IsOrHasGenericInterfaceTypeOf(typeof(IEnumerable<>))
                 && m.Object.Type != typeof(string)
-                && m.Method.Name == "Contains")
-            {
-                return m.Arguments.Count == 1;
-            }
-
-            return false;
+                && m.Method.Name == "Contains"
+                && m.Arguments.Count == 1);
         }
 
         protected virtual object VisitEnumerableMethodCall(MethodCallExpression m)
@@ -2000,14 +1997,10 @@ private object ToInPartialString(Expression memberExpr, object quotedColName)
             return new PartialSqlString(statement);
         }
 
-        private bool IsStaticStringMethod(MethodCallExpression m)
+        private static bool IsStaticStringMethod(MethodCallExpression m)
         {
-            if (m.Object == null && m.Method.Name == "Concat")
-            {
-                return true;
-            }
-
-            return false;
+            return (m.Object == null 
+                && m.Method.Name == "Concat");
         }
 
         protected virtual object VisitStaticStringMethodCall(MethodCallExpression m)
@@ -2051,7 +2044,6 @@ protected virtual object VisitSqlMethodCall(MethodCallExpression m)
                 case "In":
                     statement = ConvertInExpressionToSql(m, quotedColName);
                     break;
-
                 case "Desc":
                     statement = string.Format("{0} DESC", quotedColName);
                     break;

src/ServiceStack.OrmLite/OrmLiteExecFilter.cs

@@ -74,7 +74,7 @@ public virtual T Exec<T>(IDbConnection dbConn, Func<IDbCommand, T> filter)
             }
         }
 
-        public IDbCommand Exec(IDbConnection dbConn, Func<IDbCommand, IDbCommand> filter)
+        public virtual IDbCommand Exec(IDbConnection dbConn, Func<IDbCommand, IDbCommand> filter)
         {
             var dbCmd = CreateCommand(dbConn);
             var ret = filter(dbCmd);
@@ -117,7 +117,7 @@ public virtual Task<T> Exec<T>(IDbConnection dbConn, Func<IDbCommand, Task<T>> f
                 });
         }
 
-        public Task<IDbCommand> Exec(IDbConnection dbConn, Func<IDbCommand, Task<IDbCommand>> filter)
+        public virtual Task<IDbCommand> Exec(IDbConnection dbConn, Func<IDbCommand, Task<IDbCommand>> filter)
         {
             var dbCmd = CreateCommand(dbConn);