Merge CaptureSqlCommandFilter into CaptureSqlFilter so there's a single class to capture SQL

Author: mythz

src/ServiceStack.OrmLite/OrmLiteResultsFilter.cs

@@ -321,22 +321,6 @@ public void Dispose()
     public class CaptureSqlFilter : OrmLiteResultsFilter
     {
         public CaptureSqlFilter()
-        {
-            SqlFilter = CaptureSql;
-            SqlStatements = new List<string>();
-        }
-
-        private void CaptureSql(string sql)
-        {
-            SqlStatements.Add(sql);
-        }
-
-        public List<string> SqlStatements { get; set; }
-    }
-
-    public class CaptureSqlCommandFilter : OrmLiteResultsFilter
-    {
-        public CaptureSqlCommandFilter()
         {
             SqlCommandFilter = CaptureSqlCommand;
             SqlCommandHistory = new List<SqlCommandDetails>();
@@ -348,6 +332,11 @@ private void CaptureSqlCommand(IDbCommand command)
         }
 
         public List<SqlCommandDetails> SqlCommandHistory { get; set; }
+
+        public List<string> SqlStatements
+        {
+            get { return SqlCommandHistory.Map(x => x.Sql); }
+        }
     }
 
     public class SqlCommandDetails

tests/ServiceStack.OrmLite.Tests/CaptureSqlCommandFilterTests.cs

@@ -13,7 +13,7 @@ public class CaptureSqlCommandFilterTests
         [Test]
         public void Can_capture_command_each_type_of_API()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 db.CreateTable<Person>();
@@ -42,7 +42,7 @@ public void Can_capture_command_CreateTable_APIs()
                 db.DropTable<Person>();
             }
 
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -61,7 +61,7 @@ public void Can_capture_command_CreateTable_APIs()
         [Test]
         public void Can_capture_command_Select_APIs()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -109,7 +109,7 @@ public void Can_capture_command_Select_APIs()
         [Test]
         public void Can_capture_command_all_Single_Apis()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -138,7 +138,7 @@ public void Can_capture_command_all_Single_Apis()
         [Test]
         public void Can_capture_command_all_Scalar_Apis()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -168,7 +168,7 @@ public void Can_capture_command_all_Scalar_Apis()
         [Test]
         public void Can_capture_command_Update_Apis()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -199,7 +199,7 @@ public void Can_capture_command_Update_Apis()
         [Test]
         public void Can_capture_command_Delete_Apis()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -231,7 +231,7 @@ public void Can_capture_command_Delete_Apis()
         [Test]
         public void Can_capture_command_CustomSql_Apis()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -261,7 +261,7 @@ public void Can_capture_command_CustomSql_Apis()
         [Test]
         public void Can_capture_command_Insert_Apis()
         {
-            using (var captured = new CaptureSqlCommandFilter())
+            using (var captured = new CaptureSqlFilter())
             using (var db = OpenDbConnection())
             {
                 int i = 0;
@@ -282,5 +282,16 @@ public void Can_capture_command_Insert_Apis()
             }
         }
 
+        [Test]
+        public void Can_capture_basic_Query()
+        {
+            using (var captured = new CaptureSqlFilter())
+            using (var db = OpenDbConnection())
+            {
+                db.Where<Person>(new { Age = 27 });
+
+                captured.SqlCommandHistory[0].PrintDump();
+            }
+        }
     }
 }