move extensions to root namespace Vitorm

src/Vitorm.MySql/DataProvider.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.DataProvider;
 using Vitorm.Sql;
 

src/Vitorm.MySql/DbContext_Extensions.cs → src/Vitorm.MySql/DbContext_Extensions_UseMySql.cs

@@ -4,9 +4,9 @@ using System.Data;
 using Vitorm.Sql;
 using Vitorm.Sql.SqlTranslate;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
-    public static class DbContext_Extensions
+    public static class DbContext_Extensions_UseMySql
     {
         /*
          // ref: https://dev.mysql.com/doc/refman/8.4/en/savepoint.html

src/Vitorm.MySql/TranslateService/ExecuteUpdateTranslateService.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 

src/Vitorm.SqlServer/DataProvider.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.DataProvider;
 using Vitorm.Sql;
 

src/Vitorm.SqlServer/DbContext_Extensions.cs → src/Vitorm.SqlServer/DbContext_Extensions_UseSqlServer.cs

@@ -4,9 +4,9 @@ using System.Data;
 using Vitorm.Sql;
 using Vitorm.Sql.SqlTranslate;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
-    public static class DbContext_Extensions
+    public static class DbContext_Extensions_UseSqlServer
     {
         public static SqlDbContext UseSqlServer(this SqlDbContext dbContext, string connectionString, int? commandTimeout = null)
         {

src/Vitorm.SqlServer/SqlTranslate/ExecuteUpdateTranslateService.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 

src/Vitorm.SqlServer/SqlTranslate/QueryTranslateService.cs

@@ -1,7 +1,5 @@
 using System;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.DataReader;
 using Vitorm.Sql.DataReader;
 using Vitorm.Sql.SqlTranslate;

src/Vitorm.Sqlite/DataProvider.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.DataProvider;
 using Vitorm.Sql;
 

src/Vitorm.Sqlite/DbContext_Extensions.cs → src/Vitorm.Sqlite/DbContext_Extensions_UseSqlite.cs

@@ -4,9 +4,9 @@ using System.Data;
 using Vitorm.Sql;
 using Vitorm.Sql.SqlTranslate;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
-    public static class DbContext_Extensions
+    public static class DbContext_Extensions_UseSqlite
     {
         public static SqlDbContext UseSqlite(this SqlDbContext dbContext, string connectionString, int? commandTimeout = null)
         {

src/Vitorm.Sqlite/TranslateService/ExecuteUpdateTranslateService.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 using Vitorm.Sql.SqlTranslate;
 using Vitorm.StreamQuery;
 

src/Vitorm/DataProvider/IDataProvider_Extensions.cs

@@ -1,7 +1,7 @@
 using Vitorm.DataProvider;
 using Vitorm.Sql;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
     public static class IDataProvider_Extensions
     {

src/Vitorm/DbContext.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using Vit.Linq.ExpressionTree;
+using Vit.Linq.ExpressionTree.ExpressionConvertor.MethodCalls;
 
 using Vitorm.Entity;
 using Vitorm.Entity.Loader;
@@ -17,9 +18,35 @@ namespace Vitorm
         }
 
 
+        #region ExpressionConvertService
+        public static ExpressionConvertService CreateDefaultExpressionConvertService()
+        {
+            var convertService = new ExpressionConvertService();
+            convertService.RegisterMethodConvertor(new MethodConvertor_ForType(typeof(DbFunction)));
+            convertService.RegisterMethodConvertor(new MethodConvertor_ForType(typeof(Orm_Extensions)));
+            return convertService;
+        }
+        public static ExpressionConvertService defaultExpressionConvertService = CreateDefaultExpressionConvertService();
+
+        public virtual ExpressionConvertService convertService => defaultExpressionConvertService;
+        #endregion
+
+
+
+        #region EntityLoader
+
+        public static DefaultEntityLoader defaultEntityLoader = new();
+
+        public IEntityLoader entityLoader = defaultEntityLoader;
+        public virtual IEntityDescriptor GetEntityDescriptor(Type entityType) => entityLoader.LoadDescriptor(entityType);
+        #endregion
+
+
+
+
         #region DbSet
 
-        public IDbSet DefaultDbSetCreator(Type entityType)
+        protected IDbSet DefaultDbSetCreator(Type entityType)
         {
             var entityDescriptor = GetEntityDescriptor(entityType);
             return DbSetConstructor.CreateDbSet(this, entityType, entityDescriptor);
@@ -27,7 +54,7 @@ namespace Vitorm
 
         protected virtual Func<Type, IDbSet> dbSetCreator { set; get; }
 
-        Dictionary<Type, IDbSet> dbSetMap = null;
+        protected Dictionary<Type, IDbSet> dbSetMap = null;
 
         public virtual IDbSet DbSet(Type entityType)
         {
@@ -46,14 +73,6 @@ namespace Vitorm
         }
         #endregion
 
-        public static DefaultEntityLoader defaultEntityLoader = new();
-
-        public IEntityLoader entityLoader = defaultEntityLoader;
-
-        public virtual IEntityDescriptor GetEntityDescriptor(Type entityType) => entityLoader.LoadDescriptor(entityType);
-
-
-        public virtual ExpressionConvertService convertService => Environment.convertService;
 
 
 

src/Vitorm/Entity/Extensions/IEntityDescriptor_Extensions.cs → src/Vitorm/Entity/IEntityDescriptor_Extensions.cs

@@ -2,7 +2,7 @@
 
 using Vitorm.Entity;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
     public static partial class IEntityDescriptor_Extensions
     {

src/Vitorm/Environment.cs

@@ -1,23 +0,0 @@
-using Vit.Extensions.Vitorm_Extensions;
-using Vit.Linq.ExpressionTree;
-using Vit.Linq.ExpressionTree.ExpressionConvertor.MethodCalls;
-
-namespace Vitorm
-{
-    public class Environment
-    {
-        public static ExpressionConvertService convertService;
-        static Environment()
-        {
-            convertService = GetInitedConvertService();
-        }
-
-        public static ExpressionConvertService GetInitedConvertService()
-        {
-            var convertService = new ExpressionConvertService();
-            convertService.RegisterMethodConvertor(new MethodConvertor_ForType(typeof(DbFunction)));
-            convertService.RegisterMethodConvertor(new MethodConvertor_ForType(typeof(Orm_Extensions)));
-            return convertService;
-        }
-    }
-}

src/Vitorm/Extensions/Vitorm_Extensions/Orm_Extensions_ExecuteDelete.cs → src/Vitorm/Extensions/Orm_Extensions/Orm_Extensions_ExecuteDelete.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
 
     public static partial class Orm_Extensions

src/Vitorm/Extensions/Vitorm_Extensions/Orm_Extensions_ExecuteUpdate.cs → src/Vitorm/Extensions/Orm_Extensions/Orm_Extensions_ExecuteUpdate.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
 
     public static partial class Orm_Extensions

src/Vitorm/Extensions/Vitorm_Extensions/Orm_Extensions_ToExecuteString.cs → src/Vitorm/Extensions/Orm_Extensions/Orm_Extensions_ToExecuteString.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-namespace Vit.Extensions.Vitorm_Extensions
+namespace Vitorm
 {
 
     public static partial class Orm_Extensions

src/Vitorm/Sql/SqlDbContext.cs

@@ -3,12 +3,13 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Linq.Expressions;
-using Vit.Linq.ExpressionTree.ComponentModel;
+
 using Vit.Linq;
-using Vitorm.Sql.Transaction;
+using Vit.Linq.ExpressionTree.ComponentModel;
+
 using Vitorm.Sql.SqlTranslate;
+using Vitorm.Sql.Transaction;
 using Vitorm.StreamQuery;
-using Vit.Extensions.Vitorm_Extensions;
 
 namespace Vitorm.Sql
 {

src/Vitorm/Sql/SqlTranslate/QueryTranslateService.cs

@@ -2,7 +2,6 @@
 using Vitorm.DataReader;
 using Vitorm.Sql.DataReader;
 using Vitorm.StreamQuery;
-using Vit.Extensions.Vitorm_Extensions;
 
 namespace Vitorm.Sql.SqlTranslate
 {

src/Vitorm/Sql/SqlTranslate/SqlTranslateService.cs

@@ -8,10 +8,6 @@ using Vitorm.StreamQuery;
 using System.Collections;
 using System.Text;
 using System.Linq.Expressions;
-using static Vitorm.Sql.SqlDbContext;
-using System.Data;
-using Vit.Linq.ExpressionTree.ExpressionConvertor;
-using Vit.Extensions.Vitorm_Extensions;
 
 namespace Vitorm.Sql.SqlTranslate
 {

src/Vitorm/StreamQuery/StreamReader.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 
-using Vit.Extensions.Vitorm_Extensions;
 using Vit.Linq.ExpressionTree.ComponentModel;
 
 namespace Vitorm.StreamQuery

src/Vitorm/TypeUtil.cs

@@ -1,11 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Security.Cryptography;
-
-using Vit.Linq.ExpressionTree.ComponentModel;
-
 
 namespace Vitorm
 {

test/Vitorm.Data.Console/Program.cs

@@ -1,5 +1,4 @@
-using Vit.Extensions.Vitorm_Extensions;
-using Vitorm;
+using Vitorm;
 
 namespace App
 {

test/Vitorm.Data.MsTest/CommonTest/UserTest.cs

@@ -1,7 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-using Vit.Extensions.Vitorm_Extensions;
-
 
 namespace Vitorm.MsTest
 {

test/Vitorm.MySql.MsTest/CustomTest/DbFunction_Test.cs

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CustomTest
 {

test/Vitorm.MySql.MsTest/DataSource.cs

@@ -1,5 +1,4 @@
 using Vit.Core.Util.ConfigurationManager;
-using Vit.Extensions.Vitorm_Extensions;
 
 using Vitorm.Sql;
 

test/Vitorm.SqlServer.MsTest/CustomTest/DbFunction_Test.cs

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CustomTest
 {

test/Vitorm.SqlServer.MsTest/DataSource.cs

@@ -1,5 +1,4 @@
 using Vit.Core.Util.ConfigurationManager;
-using Vit.Extensions.Vitorm_Extensions;
 
 using Vitorm.Sql;
 

test/Vitorm.Sqlite.Console/Program.cs

@@ -1,5 +1,4 @@
-using Vit.Extensions.Vitorm_Extensions;
-using Vitorm;
+using Vitorm;
 
 namespace App
 {

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

@@ -6,7 +6,6 @@ using Vitorm.Entity;
 using Vitorm.Entity.DataAnnotations;
 using Vitorm.Entity.Loader;
 using Vitorm.Entity.LoaderAttribute;
-using Vit.Extensions.Vitorm_Extensions;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 
 namespace Vitorm.MsTest.CommonTest

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 
 namespace Vitorm.MsTest.CommonTest

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 
 namespace Vitorm.MsTest.CommonTest

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

@@ -1,7 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

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

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CommonTest
 {

test/Vitorm.Sqlite.MsTest/CustomTest/DbFunction_Test.cs

@@ -1,6 +1,6 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Extensions.Vitorm_Extensions;
-using System.Data;
+using System.Data;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Vitorm.MsTest.CustomTest
 {

test/Vitorm.Sqlite.MsTest/DataSource.cs

@@ -1,6 +1,4 @@
-using Vit.Extensions.Vitorm_Extensions;
-
-using Vitorm.Sql;
+using Vitorm.Sql;
 
 namespace Vitorm.MsTest
 {