Merge branch 'master' of https://github.com/ilyalukyanov/ServiceStack.OrmLite

Author: ilyalukyanov

src/ServiceStack.OrmLite.VistaDB/VistaDB4Expression.cs

@@ -216,10 +216,10 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
         {
             if (m.Arguments.Count == 1 && m.Method.Name == "Equals")
             {
-                var caller = this.Visit(m.Object);
-                var arg = this.Visit(m.Arguments.First());
-
-                return new PartialSqlString(String.Format("{0} = {1}", caller, arg));
+                return Visit(
+                    Expression.Equal(
+                        Expression.Convert(m.Object, typeof(object)),
+                        Expression.Convert(m.Arguments.First(), typeof(object))));
             }
             else
             {
@@ -232,4 +232,4 @@ public override SqlExpression<T> Clone()
             return CopyTo(new VistaDB4Expression<T>());
         }
     }
-}
+}

src/ServiceStack.OrmLite.VistaDB/VistaDB5DialectProvider .cs

@@ -67,9 +67,9 @@ public override IDbConnection CreateConnection(string connectionString, Dictiona
             if (!isFullConnectionString)
             {
                 var filePath = connectionString;
-                var filePathWithExt = filePath.ToLower().EndsWith(".vdb4")
+                var filePathWithExt = filePath.ToLower().EndsWith(".vdb5")
                     ? filePath
-                    : filePath + ".vdb4";
+                    : filePath + ".vdb5";
 
                 var fileName = Path.GetFileName(filePathWithExt);
 

src/ServiceStack.OrmLite.VistaDB/VistaDB5Expression.cs

@@ -120,10 +120,10 @@ protected override object VisitColumnAccessMethod(MethodCallExpression m)
         {
             if (m.Arguments.Count == 1 && m.Method.Name == "Equals")
             {
-                var caller = this.Visit(m.Object);
-                var arg = this.Visit(m.Arguments.First());
-
-                return new PartialSqlString(String.Format("{0} = {1}", caller, arg));
+                return Visit(
+                    Expression.Equal(
+                        Expression.Convert(m.Object, typeof(object)),
+                        Expression.Convert(m.Arguments.First(), typeof(object))));
             }
             else
             {
@@ -136,4 +136,4 @@ public override SqlExpression<T> Clone()
             return CopyTo(new VistaDB5Expression<T>());
         }
     }
-}
+}