Casual optimize

src/Vitorm/Sql/Extensions/CombinedStream_Extensions_QueryExecutor.cs

@@ -1,4 +1,4 @@
-using Vitorm.Sql;
+using Vitorm.Sql.QueryExecutor;
 using Vitorm.StreamQuery;
 
 namespace Vitorm

src/Vitorm/Sql/QueryExecutor/Async/CountAsync.cs

@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     /// <summary>
     /// Queryable.Count or Queryable_Extensions.TotalCount

src/Vitorm/Sql/QueryExecutor/Async/FirstOrDefaultAsync.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public partial class FirstOrDefaultAsync : IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/Async/ToListAndTotalCountAsync.cs

@@ -9,7 +9,7 @@ using Vit.Linq;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public partial class ToListAndTotalCountAsync : IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/Async/ToListAsync.cs

@@ -9,7 +9,7 @@ using Vit.Linq;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public partial class ToListAsync : IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/IQueryExecutor.cs

@@ -1,4 +1,4 @@
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public interface IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/QueryExecutorArgument.cs

@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public class QueryExecutorArgument
     {

src/Vitorm/Sql/QueryExecutor/QueryExecutor_Delegate.cs

@@ -1,7 +1,7 @@
 
-using FuncQueryExecutor = System.Func<Vitorm.Sql.QueryExecutorArgument, object>;
+using FuncQueryExecutor = System.Func<Vitorm.Sql.QueryExecutor.QueryExecutorArgument, object>;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public class QueryExecutor_Delegate : IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/Sync/Count.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     /// <summary>
     /// Queryable.Count or Queryable_Extensions.TotalCount

src/Vitorm/Sql/QueryExecutor/Sync/FirstOrDefault.cs

@@ -3,7 +3,7 @@
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public partial class FirstOrDefault : IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/Sync/ToList.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public partial class ToList : IQueryExecutor
     {

src/Vitorm/Sql/QueryExecutor/Sync/ToListAndTotalCount.cs

@@ -7,7 +7,7 @@ using Vit.Linq;
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 
-namespace Vitorm.Sql
+namespace Vitorm.Sql.QueryExecutor
 {
     public partial class ToListAndTotalCount : IQueryExecutor
     {

src/Vitorm/Sql/SqlDbContext.Query.cs

@@ -98,7 +98,6 @@ namespace Vitorm.Sql
             AddDefaultQueryExecutor(FirstOrDefaultAsync.Instance, methodName: nameof(Queryable_AsyncExtensions.FirstAsync));
             AddDefaultQueryExecutor(FirstOrDefaultAsync.Instance, methodName: nameof(Queryable_AsyncExtensions.LastOrDefaultAsync));
             AddDefaultQueryExecutor(FirstOrDefaultAsync.Instance, methodName: nameof(Queryable_AsyncExtensions.LastAsync));
-
             #endregion
 
             return defaultQueryExecutors;
@@ -117,7 +116,7 @@ namespace Vitorm.Sql
 
         public bool query_ToListAndTotalCount_InvokeInOneExecute = true;
 
-        protected bool QueryIsFromSameDb(object query, Type elementType)
+        protected virtual bool QueryIsFromSameDb(object query, Type elementType)
         {
             return dbGroupName == QueryableBuilder.GetQueryConfig(query as IQueryable) as string;
         }

test/Vitorm.Sqlite.MsTest/CommonTest/CRUDAsync_Test.cs

@@ -23,8 +23,6 @@ namespace Vitorm.MsTest.CommonTest
 
             await dbContext.TryCreateTableAsync<User>();
             await dbContext.TryCreateTableAsync<User>();
-
-            await dbContext.TruncateAsync<User>();
         }
         #endregion
 

test/Vitorm.Sqlite.MsTest/CommonTest/CRUD_Test.cs

@@ -21,8 +21,6 @@ namespace Vitorm.MsTest.CommonTest
 
             dbContext.TryCreateTable<User>();
             dbContext.TryCreateTable<User>();
-
-            dbContext.Truncate<User>();
         }
         #endregion
 

test/Vitorm.Sqlite.MsTest/CommonTest/Orm_Extensions_ToExecuteString_Test.cs

@@ -32,8 +32,8 @@ namespace Vitorm.MsTest.CommonTest
                              })
                             .Skip(1).Take(2);
 
-                var sql = query.ToExecuteString();
-                Assert.AreEqual(false, string.IsNullOrWhiteSpace(sql));
+                var executeString = query.ToExecuteString();
+                Assert.AreEqual(false, string.IsNullOrWhiteSpace(executeString));
 
                 var list = query.ToList();
                 Assert.AreEqual(2, list.Count);

test/Vitorm.Sqlite.MsTest/CommonTest/Query_AsyncMethods_Test.cs

@@ -33,7 +33,6 @@ namespace Vitorm.MsTest.CommonTest
         }
 
 
-
         [TestMethod]
         public async Task Test_Count()
         {

test/Vitorm.Sqlite.MsTest/CommonTest/Query_LinqMethods_Test.cs

@@ -140,6 +140,7 @@ namespace Vitorm.MsTest.CommonTest
                 Assert.AreEqual(6, userList.Count);
                 Assert.AreEqual(6, userList[0].id);
             }
+
             {
                 var query = userQuery.OrderByDescending(user => user.id).Select(user => new { fid = user.fatherId, user.id });
 
@@ -149,13 +150,10 @@ namespace Vitorm.MsTest.CommonTest
                 Assert.AreEqual(6, userList.Count);
                 Assert.AreEqual(6, userList[0].id);
             }
-
         }
 
 
 
-
-
         [TestMethod]
         public void Test_Count()
         {
@@ -180,6 +178,7 @@ namespace Vitorm.MsTest.CommonTest
             }
         }
 
+
         [TestMethod]
         public void Test_TotalCount()
         {

test/Vitorm.Sqlite.MsTest/CommonTest/Truncate_Test.cs

@@ -2,7 +2,6 @@
 
 namespace Vitorm.MsTest.CommonTest
 {
-
     [TestClass]
     public partial class Truncate_Test
     {
@@ -12,7 +11,7 @@ namespace Vitorm.MsTest.CommonTest
         {
             using var dbContext = DataSource.CreateDbContextForWriting();
 
-            // Count
+            // assert
             {
                 var count = dbContext.Query<User>().Count();
                 Assert.AreEqual(6, count);
@@ -22,7 +21,7 @@ namespace Vitorm.MsTest.CommonTest
 
             DataSource.WaitForUpdate();
 
-            // Count
+            // assert
             {
                 var count = dbContext.Query<User>().Count();
                 Assert.AreEqual(0, count);
@@ -30,5 +29,29 @@ namespace Vitorm.MsTest.CommonTest
         }
 
 
+        [TestMethod]
+        public async Task Test_TruncateAsync()
+        {
+            using var dbContext = DataSource.CreateDbContextForWriting();
+
+            // assert
+            {
+                var count = dbContext.Query<User>().Count();
+                Assert.AreEqual(6, count);
+            }
+
+            await dbContext.TruncateAsync<User>();
+
+            DataSource.WaitForUpdate();
+
+            // assert
+            {
+                var count = dbContext.Query<User>().Count();
+                Assert.AreEqual(0, count);
+            }
+        }
+
+
+
     }
 }