Эх сурвалжийг харах

rename Create to TryCreateTable
rename Drop to TryDropTable

Lith 10 сар өмнө
parent
commit
7fc07fd122

+ 0 - 4
doc/TODO.md

@@ -1,10 +1,6 @@
 # Vitorm TODO
 
 
-rename Create to TryCreateTable
-rename Drop to TryDropTable
-
-
 # group then orderBy aggregate column
 > [QueryTranslator] not suported MethodCall: Sum
 ``` csharp

+ 34 - 0
src/Vitorm.Data/Data.DataProviderCache.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+
+using Vitorm.DataProvider;
+
+namespace Vitorm
+{
+    public partial class Data
+    {
+        public class DataProviderCache
+        {
+            public readonly IDataProvider dataProvider;
+            public readonly string @namespace;
+            private readonly string classFullNamePrefix;
+            public readonly Dictionary<string, object> dataSourceConfig;
+
+            public DataProviderCache(IDataProvider dataProvider, Dictionary<string, object> dataSourceConfig)
+            {
+                this.dataProvider = dataProvider;
+                this.dataSourceConfig = dataSourceConfig;
+
+                if (dataSourceConfig.TryGetValue("namespace", out var ns))
+                {
+                    @namespace = ns as string;
+                    classFullNamePrefix = @namespace + ".";
+                }
+            }
+            internal bool Match(string classFullName)
+            {
+                return classFullName.StartsWith(classFullNamePrefix);
+            }
+        }
+
+    }
+}

+ 3 - 29
src/Vitorm.Data/Data.cs

@@ -61,32 +61,6 @@ namespace Vitorm
         }
 
 
-
-        public class DataProviderCache
-        {
-            public readonly IDataProvider dataProvider;
-            public readonly string @namespace;
-            private readonly string classFullNamePrefix;
-            public readonly Dictionary<string, object> dataSourceConfig;
-
-            public DataProviderCache(IDataProvider dataProvider, Dictionary<string, object> dataSourceConfig)
-            {
-                this.dataProvider = dataProvider;
-                this.dataSourceConfig = dataSourceConfig;
-
-                if (dataSourceConfig.TryGetValue("namespace", out var ns))
-                {
-                    @namespace = ns as string;
-                    classFullNamePrefix = @namespace + ".";
-                }
-            }
-            internal bool Match(string classFullName)
-            {
-                return classFullName.StartsWith(classFullNamePrefix);
-            }
-        }
-
-
         static readonly ConcurrentDictionary<Type, IDataProvider> providerMap = new();
 
         static readonly List<DataProviderCache> providerCache = new();
@@ -134,9 +108,9 @@ namespace Vitorm
 
         #region CRUD
 
-        // #0 Schema :  Create
-        public static void Create<Entity>() => DataProvider<Entity>().Create<Entity>();
-        public static void Drop<Entity>() => DataProvider<Entity>().Drop<Entity>();
+        // #0 Schema :  TryCreateTable TryDropTable
+        public static void TryCreateTable<Entity>() => DataProvider<Entity>().TryCreateTable<Entity>();
+        public static void TryDropTable<Entity>() => DataProvider<Entity>().TryDropTable<Entity>();
 
 
         // #1 Create :  Add AddRange

+ 2 - 2
src/Vitorm/DataProvider/SqlDataProvider.cs

@@ -29,8 +29,8 @@ namespace Vitorm.DataProvider
 
 
         // #0 Schema :  Create
-        public virtual void Create<Entity>() => InvokeInDb(db => db.Create<Entity>());
-        public virtual void Drop<Entity>() => InvokeInDb(db => db.Drop<Entity>());
+        public virtual void TryCreateTable<Entity>() => InvokeInDb(db => db.TryCreateTable<Entity>());
+        public virtual void TryDropTable<Entity>() => InvokeInDb(db => db.TryDropTable<Entity>());
 
 
         // #1 Create :  Add AddRange

+ 2 - 2
src/Vitorm/DbContext.cs

@@ -106,8 +106,8 @@ namespace Vitorm
 
 
         // #0 Schema :  Create Drop
-        public virtual void Create<Entity>() => throw new NotImplementedException();
-        public virtual void Drop<Entity>() => throw new NotImplementedException();
+        public virtual void TryCreateTable<Entity>() => throw new NotImplementedException();
+        public virtual void TryDropTable<Entity>() => throw new NotImplementedException();
 
 
         // #1 Create :  Add AddRange

+ 2 - 2
src/Vitorm/DbSet.cs

@@ -45,8 +45,8 @@ namespace Vitorm
 
 
 
-        public virtual void Create() => dbContext.Create<Entity>();
-        public virtual void Drop() => dbContext.Drop<Entity>();
+        public virtual void TryCreateTable() => dbContext.TryCreateTable<Entity>();
+        public virtual void TryDropTable() => dbContext.TryDropTable<Entity>();
 
 
 

+ 2 - 2
src/Vitorm/IDbContext.cs

@@ -6,8 +6,8 @@ namespace Vitorm
     public interface IDbContext
     {
         // #0 Schema :  Create Drop
-        void Create<Entity>();
-        void Drop<Entity>();
+        void TryCreateTable<Entity>();
+        void TryDropTable<Entity>();
 
 
         // #1 Create :  Add AddRange

+ 2 - 2
src/Vitorm/Sql/SqlDbContext.cs

@@ -111,7 +111,7 @@ namespace Vitorm.Sql
 
         #region #0 Schema :  Create Drop
 
-        public override void Create<Entity>()
+        public override void TryCreateTable<Entity>()
         {
             // #0 get arg
             var entityDescriptor = GetEntityDescriptor(typeof(Entity));
@@ -119,7 +119,7 @@ namespace Vitorm.Sql
             string sql = sqlTranslateService.PrepareCreate(entityDescriptor);
             Execute(sql: sql);
         }
-        public override void Drop<Entity>()
+        public override void TryDropTable<Entity>()
         {
             // #0 get arg
             var entityDescriptor = GetEntityDescriptor(typeof(Entity));

+ 2 - 2
test/Vitorm.Data.Benchmark/Runner/EnvSetup.cs

@@ -6,8 +6,8 @@ namespace App.Runner
     {
         public static void InitDb()
         {
-            Data.Drop<User>();
-            Data.Create<User>();
+            Data.TryDropTable<User>();
+            Data.TryCreateTable<User>();
 
             var users = new List<User> {
                     new User { id=1, name="u146", fatherId=4, motherId=6 },

+ 2 - 2
test/Vitorm.Data.Console/Program.cs

@@ -9,8 +9,8 @@ namespace App
             // #1 No need to init Vitorm.Data
 
             // #2 Create Table
-            Data.Drop<User>();
-            Data.Create<User>();
+            Data.TryDropTable<User>();
+            Data.TryCreateTable<User>();
 
             // #3 Insert Records
             Data.Add(new User { id = 1, name = "lith" });

+ 2 - 2
test/Vitorm.Data.MsTest/CommonTest/ClickHouse_Test.cs

@@ -45,8 +45,8 @@ namespace Vitorm.MsTest
         {
             using var dbContext = Data.DataProvider<User>()?.CreateDbContext() as SqlDbContext;
 
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
 
             var users = new List<User> {
                     new User { id=1, name="u146", fatherId=4, motherId=6 },

+ 2 - 2
test/Vitorm.Data.MsTest/CommonTest/ElasticSearch_Test.cs

@@ -49,8 +49,8 @@ namespace Vitorm.MsTest
         {
             using var dbContext = Data.DataProvider<User>()?.CreateDbContext() as Vitorm.ElasticSearch.DbContext;
 
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
 
             var users = new List<User> {
                     new User { key="1",id=1, name="u146", fatherId=4, motherId=6 },

+ 2 - 2
test/Vitorm.Data.MsTest/CommonTest/MySql_Test.cs

@@ -50,8 +50,8 @@ namespace Vitorm.MsTest
             using var dbContext = Data.DataProvider<User>()?.CreateDbContext() as SqlDbContext;
 
 
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
 
             var users = new List<User> {
                     new User  {   name="u146", fatherId=4, motherId=6 },

+ 2 - 2
test/Vitorm.Data.MsTest/CommonTest/SqlServer_Test.cs

@@ -48,8 +48,8 @@ namespace Vitorm.MsTest
         {
             using var dbContext = Data.DataProvider<User>()?.CreateDbContext() as SqlDbContext;
 
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
 
             var users = new List<User> {
                     new User  {   name="u146", fatherId=4, motherId=6 },

+ 2 - 2
test/Vitorm.Data.MsTest/CommonTest/SqliteReadOnly_Test.cs

@@ -68,8 +68,8 @@ namespace Vitorm.MsTest
             var filePath = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, fileName);
             using var dbContext = new SqlDbContext().UseSqlite(connectionString: $"data source={fileName};");
 
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
             dbContext.Add(new User { id = 1, name = fileName });
         }
 

+ 2 - 2
test/Vitorm.Data.MsTest/CommonTest/Sqlite_Test.cs

@@ -43,8 +43,8 @@ namespace Vitorm.MsTest
         {
             using var dbContext = Data.DataProvider<User>()?.CreateDbContext();
 
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
 
             var users = new List<User> {
                     new User { id=1, name="u146", fatherId=4, motherId=6 },

+ 4 - 4
test/Vitorm.MySql.MsTest/DataSource.cs

@@ -75,9 +75,9 @@ namespace Vitorm.MsTest
         {
             #region #1 init User
             {
-                dbContext.Drop<User>();
+                dbContext.TryDropTable<User>();
 
-                dbContext.Create<User>();
+                dbContext.TryCreateTable<User>();
 
                 var users = new List<User> {
                     new User {   name="u146", fatherId=4, motherId=6 },
@@ -102,9 +102,9 @@ namespace Vitorm.MsTest
 
             #region #2 init Class
             {
-                dbContext.Drop<UserClass>();
+                dbContext.TryDropTable<UserClass>();
 
-                dbContext.Create<UserClass>();
+                dbContext.TryCreateTable<UserClass>();
                 dbContext.AddRange(UserClass.NewClasses(1, 6));
             }
             #endregion

+ 1 - 1
test/Vitorm.MySql.MsTest/ExpressionTreeTest/Query_Test.cs

@@ -17,7 +17,7 @@ namespace Vitorm.MsTest.ExpressionTreeTest
             var dbSet = dbContext.DbSet<ExpressionTester.User>();
 
             dbContext.Execute(sql: "DROP TABLE  if exists `User2`;");
-            dbSet.Create();
+            dbSet.TryCreateTable();
             dbSet.AddRange(initUsers);
 
             var query = dbSet.Query();

+ 4 - 4
test/Vitorm.SqlServer.MsTest/DataSource.cs

@@ -77,8 +77,8 @@ namespace Vitorm.MsTest
         {
             #region #1 init User
             {
-                dbContext.Drop<User>();
-                dbContext.Create<User>();
+                dbContext.TryDropTable<User>();
+                dbContext.TryCreateTable<User>();
 
                 var users = new List<User> {
                     new User {   name="u146", fatherId=4, motherId=6 },
@@ -103,8 +103,8 @@ namespace Vitorm.MsTest
 
             #region #2 init Class
             {
-                dbContext.Drop<UserClass>();
-                dbContext.Create<UserClass>();
+                dbContext.TryDropTable<UserClass>();
+                dbContext.TryCreateTable<UserClass>();
                 dbContext.AddRange(UserClass.NewClasses(1, 6));
             }
             #endregion

+ 1 - 1
test/Vitorm.SqlServer.MsTest/ExpressionTreeTest/Query_Test.cs

@@ -17,7 +17,7 @@ namespace Vitorm.MsTest.ExpressionTreeTest
             var dbSet = dbContext.DbSet<ExpressionTester.User>();
 
             dbContext.Execute(sql: "IF OBJECT_ID(N'User2', N'U') IS  NOT  NULL \r\nDROP TABLE [User2];");
-            dbSet.Create();
+            dbSet.TryCreateTable();
             dbSet.AddRange(initUsers);
 
             var query = dbSet.Query();

+ 2 - 2
test/Vitorm.Sqlite.Console/Program.cs

@@ -11,8 +11,8 @@ namespace App
             dbContext.UseSqlite("data source=sqlite.db");
 
             // #2 Create Table
-            dbContext.Drop<User>();
-            dbContext.Create<User>();
+            dbContext.TryDropTable<User>();
+            dbContext.TryCreateTable<User>();
 
             // #3 Insert Records
             dbContext.Add(new User { id = 1, name = "lith" });

+ 4 - 4
test/Vitorm.Sqlite.MsTest/CommonTest/ChangeDatabase_Test.cs

@@ -18,8 +18,8 @@ namespace Vitorm.MsTest.CommonTest
 
                 databaseName = dbContext.databaseName;
 
-                dbContext.Drop<User>();
-                dbContext.Create<User>();
+                dbContext.TryDropTable<User>();
+                dbContext.TryCreateTable<User>();
 
                 var user = dbContext.Get<User>(1);
                 Assert.IsNull(user);
@@ -35,8 +35,8 @@ namespace Vitorm.MsTest.CommonTest
 
                 dbContext.ChangeDatabase(databaseName + "2");
 
-                dbContext.Drop<User>();
-                dbContext.Create<User>();
+                dbContext.TryDropTable<User>();
+                dbContext.TryCreateTable<User>();
 
                 var user = dbContext.Get<User>(1);
                 Assert.IsNull(user);

+ 2 - 2
test/Vitorm.Sqlite.MsTest/CommonTest/ChangeTable_Test.cs

@@ -30,8 +30,8 @@ namespace Vitorm.MsTest.CommonTest
             {
                 dbSet.ChangeTable(tableName + "2");
 
-                dbSet.Drop();
-                dbSet.Create();
+                dbSet.TryDropTable();
+                dbSet.TryCreateTable();
 
                 user = dbSet.Get(1);
                 Assert.IsNull(user);

+ 4 - 4
test/Vitorm.Sqlite.MsTest/DataSource.cs

@@ -80,8 +80,8 @@ namespace Vitorm.MsTest
         {
             #region #1 init User
             {
-                dbContext.Drop<User>();
-                dbContext.Create<User>();
+                dbContext.TryDropTable<User>();
+                dbContext.TryCreateTable<User>();
 
                 var users = new List<User> {
                     new User { id=1, name="u146", fatherId=4, motherId=6 },
@@ -103,8 +103,8 @@ namespace Vitorm.MsTest
 
             #region #2 init Class
             {
-                dbContext.Drop<UserClass>();
-                dbContext.Create<UserClass>();
+                dbContext.TryDropTable<UserClass>();
+                dbContext.TryCreateTable<UserClass>();
                 dbContext.AddRange(UserClass.NewClasses(1, 6));
             }
             #endregion

+ 1 - 1
test/Vitorm.Sqlite.MsTest/ExpressionTreeTest/Query_Test.cs

@@ -15,7 +15,7 @@ namespace Vitorm.MsTest.ExpressionTreeTest
             using var dbContext = DataSource.CreateDbContextForWriting();
             var dbSet = dbContext.DbSet<ExpressionTester.User>();
 
-            dbSet.Create();
+            dbSet.TryCreateTable();
             dbSet.AddRange(initUsers);
 
             var query = dbSet.Query();