Fix tests

Author: mythz

src/ServiceStack.OrmLite.MySql/MySqlExpression.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq.Expressions;
 
 namespace ServiceStack.OrmLite.MySql
 {
@@ -11,5 +12,10 @@ protected override PartialSqlString ToConcatPartialString(List<object> args)
         {
             return new PartialSqlString(string.Format("CONCAT({0})", string.Join(", ", args)));
         }
+
+        protected override string ToCast(string quotedColName)
+        {
+            return string.Format("cast({0} as char(1000))", quotedColName);
+        }
     }
 }

src/ServiceStack.OrmLite/Expressions/SqlExpression.cs

@@ -2155,81 +2155,60 @@ protected virtual object VisitColumnAccessMethod(MethodCallExpression m)
                     statement = string.Format("lower({0})", quotedColName);
                     break;
                 case "StartsWith":
-                    if (!OrmLiteConfig.StripUpperInLike)
-                    {
-                        statement = string.Format("upper({0}) like {1}{2}",
+                    statement = !OrmLiteConfig.StripUpperInLike
+                        ? string.Format("upper({0}) like {1}{2}",
                             quotedColName,
                             ConvertToParam(wildcardArg.ToUpper() + "%"),
-                            escapeSuffix);
-                    }
-                    else
-                    {
-                        statement = string.Format("{0} like {1}{2}",
+                            escapeSuffix)
+                        : string.Format("{0} like {1}{2}",
                             quotedColName,
                             ConvertToParam(wildcardArg + "%"),
                             escapeSuffix);
-                    }
                     break;
                 case "EndsWith":
-                    if (!OrmLiteConfig.StripUpperInLike)
-                    {
-                        statement = string.Format("upper({0}) like {1}{2}",
+                    statement = !OrmLiteConfig.StripUpperInLike
+                        ? string.Format("upper({0}) like {1}{2}",
                             quotedColName,
                             ConvertToParam("%" + wildcardArg.ToUpper()),
-                            escapeSuffix);
-                    }
-                    else
-                    {
-                        statement = string.Format("{0} like {1}{2}",
+                            escapeSuffix)
+                        : string.Format("{0} like {1}{2}",
                             quotedColName,
                             ConvertToParam("%" + wildcardArg),
                             escapeSuffix);
-                    }
                     break;
                 case "Contains":
-                    if (!OrmLiteConfig.StripUpperInLike)
-                    {
-                        statement = string.Format("upper({0}) like {1}{2}",
+                    statement = !OrmLiteConfig.StripUpperInLike
+                        ? string.Format("upper({0}) like {1}{2}",
                             quotedColName,
                             ConvertToParam("%" + wildcardArg.ToUpper() + "%"),
-                            escapeSuffix);
-                    }
-                    else
-                    {
-                        statement = string.Format("{0} like {1}{2}",
+                            escapeSuffix)
+                        : string.Format("{0} like {1}{2}",
                             quotedColName,
                             ConvertToParam("%" + wildcardArg + "%"),
                             escapeSuffix);
-                    }
                     break;
                 case "Substring":
                     var startIndex = int.Parse(args[0].ToString()) + 1;
-                    if (args.Count == 2)
-                    {
-                        var length = int.Parse(args[1].ToString());
-                        statement = GetSubstringSql(quotedColName, startIndex, length);
-                    }
-                    else
-                    {
-                        statement = GetSubstringSql(quotedColName, startIndex);
-                    }
+                    statement = args.Count == 2 
+                        ? GetSubstringSql(quotedColName, startIndex, int.Parse(args[1].ToString())) 
+                        : GetSubstringSql(quotedColName, startIndex);
                     break;
                 case "ToString":
-                    if (m.Object.Type == typeof(string))
-                    {
-                        statement = string.Format("({0})", quotedColName);
-                    }
-                    else
-                    {
-                        statement = string.Format("cast({0} as varchar(1000))", quotedColName);
-                    }
+                    statement = m.Object.Type == typeof(string) 
+                        ? string.Format("({0})", quotedColName) 
+                        : ToCast(quotedColName.ToString());
                     break;
                 default:
                     throw new NotSupportedException();
             }
             return new PartialSqlString(statement);
         }
 
+        protected virtual string ToCast(string quotedColName)
+        {
+            return string.Format("cast({0} as varchar(1000))", quotedColName);
+        }
+
         public virtual string GetSubstringSql(object quotedColumn, int startIndex, int? length = null)
         {
             return length != null

tests/ServiceStack.OrmLite.Tests/Issues/JoinBoolSqlServerIssue.cs

@@ -12,8 +12,11 @@ public void Can_Join_on_bool()
         {
             using (var db = OpenDbConnection())
             {
-                db.DropAndCreateTable<TestType>();
-                db.DropAndCreateTable<TestType2>();
+                db.DropTable<TestType>();
+                db.DropTable<TestType2>();
+
+                db.CreateTable<TestType2>();
+                db.CreateTable<TestType>();
 
                 var q = db.From<TestType>()
                     .LeftJoin<TestType2>((t1, t2) => t2.BoolCol == true && t1.Id == t2.Id);