From 71a0552871574ebb2d2f92d2976ff6ad2201ffc4 Mon Sep 17 00:00:00 2001 From: 28810 <28810@YEXIANGQIN> Date: Tue, 6 Aug 2019 13:37:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FreeSql/Internal/CommonProvider/CodeFirstProvider.cs | 8 ++++---- .../CommonProvider/SelectProvider/Select1Provider.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs b/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs index c1b7830e..1a07f0d0 100644 --- a/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs +++ b/FreeSql/Internal/CommonProvider/CodeFirstProvider.cs @@ -45,12 +45,12 @@ namespace FreeSql.Internal.CommonProvider public abstract string GetComparisonDDLStatements(params Type[] entityTypes); static object syncStructureLock = new object(); - internal ConcurrentDictionary dicSyced = new ConcurrentDictionary(); + internal ConcurrentDictionary dicSyced = new ConcurrentDictionary(); public bool SyncStructure() => this.SyncStructure(typeof(TEntity)); public bool SyncStructure(params Type[] entityTypes) { if (entityTypes == null) return false; - var syncTypes = entityTypes.Where(a => dicSyced.ContainsKey(a.FullName) == false && GetTableByEntity(a)?.DisableSyncStructure == false).ToArray(); + var syncTypes = entityTypes.Where(a => dicSyced.ContainsKey(a) == false && GetTableByEntity(a)?.DisableSyncStructure == false).ToArray(); if (syncTypes.Any() == false) return false; var before = new Aop.SyncStructureBeforeEventArgs(entityTypes); _orm.Aop.SyncStructureBefore?.Invoke(this, before); @@ -63,11 +63,11 @@ namespace FreeSql.Internal.CommonProvider ddl = this.GetComparisonDDLStatements(syncTypes); if (string.IsNullOrEmpty(ddl)) { - foreach (var syncType in syncTypes) dicSyced.TryAdd(syncType.FullName, true); + foreach (var syncType in syncTypes) dicSyced.TryAdd(syncType, true); return true; } var affrows = _orm.Ado.ExecuteNonQuery(CommandType.Text, ddl); - foreach (var syncType in syncTypes) dicSyced.TryAdd(syncType.FullName, true); + foreach (var syncType in syncTypes) dicSyced.TryAdd(syncType, true); return true; } } diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs index 39313640..ef72a209 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs @@ -213,7 +213,7 @@ namespace FreeSql.Internal.CommonProvider if (typeof(TReturn) == typeof(T1)) return this as ISelect; _tables[0].Parameter = select.Parameters[0]; _selectExpression = select.Body; - (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TReturn).FullName, true); + (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TReturn), true); var ret = _orm.Select(); Select0Provider, T1>.CopyData(this, ret, null); return ret; @@ -228,7 +228,7 @@ namespace FreeSql.Internal.CommonProvider ), SelectTableInfoType.InnerJoin); if (typeof(TResult) == typeof(T1)) return this as ISelect; _selectExpression = resultSelector.Body; - (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TResult).FullName, true); + (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TResult), true); var ret = _orm.Select() as Select1Provider; Select0Provider, T1>.CopyData(this, ret, null); return ret; @@ -243,7 +243,7 @@ namespace FreeSql.Internal.CommonProvider ), SelectTableInfoType.InnerJoin); if (typeof(TResult) == typeof(T1)) return this as ISelect; _selectExpression = resultSelector.Body; - (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TResult).FullName, true); + (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TResult), true); var ret = _orm.Select() as Select1Provider; Select0Provider, T1>.CopyData(this, ret, null); return ret; @@ -275,7 +275,7 @@ namespace FreeSql.Internal.CommonProvider } if (typeof(TResult) == typeof(T1)) return this as ISelect; _selectExpression = resultSelector.Body; - (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TResult).FullName, true); + (_orm.CodeFirst as CodeFirstProvider).dicSyced.TryAdd(typeof(TResult), true); var ret = _orm.Select() as Select1Provider; Select0Provider, T1>.CopyData(this, ret, null); return ret;