Switch to use db.From<T>

Author: mythz

src/ServiceStack.OrmLite/Expressions/ReadConnectionExtensions.cs

@@ -28,6 +28,7 @@ public static IEnumerable<T> ExecLazy<T>(this IDbConnection dbConn, Func<IDbComm
         /// <summary>
         /// Create a new SqlExpression builder allowing typed LINQ-like queries.
         /// </summary>
+        [Obsolete("Use From<T>")]
         public static SqlExpression<T> SqlExpression<T>(this IDbConnection dbConn)
         {
             return OrmLiteConfig.ExecFilter.SqlExpression<T>(dbConn);

tests/ServiceStack.OrmLite.Tests/MockAllApiTests.cs

@@ -44,7 +44,7 @@ public void Can_mock_all_Select_Apis()
             {
                 Assert.That(db.Select<Person>(x => x.Age > 40)[0].FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Select<Person>(q => q.Where(x => x.Age > 40))[0].FirstName, Is.EqualTo("Mocked"));
-                Assert.That(db.Select(db.SqlExpression<Person>().Where(x => x.Age > 40))[0].FirstName, Is.EqualTo("Mocked"));
+                Assert.That(db.Select(db.From<Person>().Where(x => x.Age > 40))[0].FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Select<Person>("Age > 40")[0].FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Select<Person>("SELECT * FROM Person WHERE Age > 40")[0].FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Select<Person>("Age > @age", new { age = 40 })[0].FirstName, Is.EqualTo("Mocked"));
@@ -61,11 +61,9 @@ public void Can_mock_all_Select_Apis()
                 Assert.That(db.SelectLazy<Person>().ToList()[0].FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.WhereLazy<Person>(new { Age = 27 }).ToList()[0].FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Select<Person>()[0].FirstName, Is.EqualTo("Mocked"));
-                Assert.That(db.Select<Person>()[0].FirstName, Is.EqualTo("Mocked"));
-                Assert.That(db.Select<Person>()[0].FirstName, Is.EqualTo("Mocked"));
 
                 Assert.That(db.Single<Person>(x => x.Age == 42).FirstName, Is.EqualTo("Mocked"));
-                Assert.That(db.Single(db.SqlExpression<Person>().Where(x => x.Age == 42)).FirstName, Is.EqualTo("Mocked"));
+                Assert.That(db.Single(db.From<Person>().Where(x => x.Age == 42)).FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Single<Person>(new { Age = 42 }).FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Single<Person>("Age = @age", new { age = 42 }).FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.SingleFmt<Person>("Age = {0}", 42).FirstName, Is.EqualTo("Mocked"));
@@ -163,7 +161,7 @@ public void Can_mock_all_Single_Apis()
             })
             {
                 Assert.That(db.Single<Person>(x => x.Age == 42).FirstName, Is.EqualTo("Mocked"));
-                Assert.That(db.Single(db.SqlExpression<Person>().Where(x => x.Age == 42)).FirstName, Is.EqualTo("Mocked"));
+                Assert.That(db.Single(db.From<Person>().Where(x => x.Age == 42)).FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Single<Person>(new { Age = 42 }).FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.Single<Person>("Age = @age", new { age = 42 }).FirstName, Is.EqualTo("Mocked"));
                 Assert.That(db.SingleFmt<Person>("Age = {0}", 42).FirstName, Is.EqualTo("Mocked"));
@@ -184,7 +182,7 @@ public void Can_mock_all_Scalar_Apis()
                 Assert.That(db.Scalar<Person, int>(x => Sql.Max(x.Age)), Is.EqualTo(1000));
                 Assert.That(db.Scalar<Person, int>(x => Sql.Max(x.Age), x => x.Age < 50), Is.EqualTo(1000));
                 Assert.That(db.Count<Person>(x => x.Age < 50), Is.EqualTo(1000));
-                Assert.That(db.Count(db.SqlExpression<Person>().Where(x => x.Age < 50)), Is.EqualTo(1000));
+                Assert.That(db.Count(db.From<Person>().Where(x => x.Age < 50)), Is.EqualTo(1000));
                 Assert.That(db.Scalar<int>("SELECT COUNT(*) FROM Person WHERE Age > @age", new { age = 40 }), Is.EqualTo(1000));
                 Assert.That(db.ScalarFmt<int>("SELECT COUNT(*) FROM Person WHERE Age > {0}", 40), Is.EqualTo(1000));
 
@@ -279,7 +277,7 @@ public void Can_mock_all_Delete_Apis()
                 Assert.That(db.DeleteFmt(typeof(Person), "Age = {0}", 27), Is.EqualTo(10));
                 Assert.That(db.Delete<Person>(p => p.Age == 27), Is.EqualTo(10));
                 Assert.That(db.Delete<Person>(ev => ev.Where(p => p.Age == 27)), Is.EqualTo(10));
-                Assert.That(db.Delete(db.SqlExpression<Person>().Where(p => p.Age == 27)), Is.EqualTo(10));
+                Assert.That(db.Delete(db.From<Person>().Where(p => p.Age == 27)), Is.EqualTo(10));
                 Assert.That(db.DeleteFmt<Person>(where: "Age = {0}".SqlFmt(27)), Is.EqualTo(10));
                 Assert.That(db.DeleteFmt(table: "Person", where: "Age = {0}".SqlFmt(27)), Is.EqualTo(10));
             }
@@ -331,7 +329,7 @@ public void Can_hijack_all_Insert_Apis()
                 i++; db.InsertOnly(new PersonWithAutoId { FirstName = "Amy", Age = 27 }, ev => ev.Insert(p => new { p.FirstName, p.Age }));
                 Assert.That(sqlStatements.Count, Is.EqualTo(i));
 
-                i++; db.InsertOnly(new PersonWithAutoId { FirstName = "Amy", Age = 27 }, ev => db.SqlExpression<PersonWithAutoId>().Insert(p => new { p.FirstName, p.Age }));
+                i++; db.InsertOnly(new PersonWithAutoId { FirstName = "Amy", Age = 27 }, ev => db.From<PersonWithAutoId>().Insert(p => new { p.FirstName, p.Age }));
                 Assert.That(sqlStatements.Count, Is.EqualTo(i));
 
                 sqlStatements.Each(x => x.Print());