Minor enhancements in data layer

muratcakir · muratcakir · commit 1a810e2c1ca9 · 2016-06-18T00:04:56.000+02:00
diff --git a/src/Libraries/SmartStore.Data/ObjectContextBase.cs b/src/Libraries/SmartStore.Data/ObjectContextBase.cs
@@ -16,6 +16,7 @@
 using SmartStore.Core.Data;
 using SmartStore.Core.Data.Hooks;
 using SmartStore.Core.Events;
+using System.Data.Entity.Core.Objects;
 
 namespace SmartStore.Data
 {
@@ -138,7 +139,7 @@ public bool HooksEnabled
 
         public virtual string CreateDatabaseScript()
         {
-            return ((IObjectContextAdapter)this).ObjectContext.CreateDatabaseScript();
+            return ObjectContext.CreateDatabaseScript();
         }
 
 		public new DbSet<TEntity> Set<TEntity>() where TEntity : BaseEntity
@@ -219,7 +220,7 @@ private IEnumerable<DbParameter> ToParameters(params object[] parameters)
 
 				// database call
 				var reader = cmd.ExecuteReader();
-				var result = ((IObjectContextAdapter)(this)).ObjectContext.Translate<TEntity>(reader).ToList();
+				var result = ObjectContext.Translate<TEntity>(reader).ToList();
 				if (!ForceNoTracking)
 				{
 					for (int i = 0; i < result.Count; i++)
@@ -263,8 +264,8 @@ public int ExecuteSqlCommand(string sql, bool doNotEnsureTransaction = false, in
             if (timeout.HasValue)
             {
                 //store previous timeout
-                previousTimeout = ((IObjectContextAdapter)this).ObjectContext.CommandTimeout;
-                ((IObjectContextAdapter)this).ObjectContext.CommandTimeout = timeout;
+                previousTimeout = ObjectContext.CommandTimeout;
+                ObjectContext.CommandTimeout = timeout;
             }
 
             var transactionalBehavior = doNotEnsureTransaction
@@ -275,7 +276,7 @@ public int ExecuteSqlCommand(string sql, bool doNotEnsureTransaction = false, in
             if (timeout.HasValue)
             {
                 //Set previous timeout back
-                ((IObjectContextAdapter)this).ObjectContext.CommandTimeout = previousTimeout;
+                ObjectContext.CommandTimeout = previousTimeout;
             }
 
             return result;
@@ -498,27 +499,29 @@ protected internal bool IsSqlServer2012OrHigher()
 
 		public TEntity Attach<TEntity>(TEntity entity) where TEntity : BaseEntity
         {
-			var dbSet = Set<TEntity>();
-			var alreadyAttached = dbSet.Local.FirstOrDefault(x => x.Id == entity.Id);
-
-			if (alreadyAttached == null)
+			ObjectStateEntry entry;
+			if (ObjectContext.ObjectStateManager.TryGetObjectStateEntry(entity, out entry))
 			{
-				dbSet.Attach(entity);
-				return entity;
+				if (entry.State != System.Data.Entity.EntityState.Detached)
+				{
+					return (TEntity)entry.Entity;
+				}
 			}
 
-			return alreadyAttached;
+			Set<TEntity>().Attach(entity);
+			return entity;
 		}
 
 		public bool IsAttached<TEntity>(TEntity entity) where TEntity : BaseEntity
         {
-			if (entity != null)
+			ObjectStateEntry entry;
+			if (ObjectContext.ObjectStateManager.TryGetObjectStateEntry(entity, out entry))
 			{
-				return Set<TEntity>().Local.Any(x => x.Id == entity.Id);
+				return (entry.State != System.Data.Entity.EntityState.Detached);
 			}
-
+			
 			return false;
-        }
+		}
 
         public void DetachEntity<TEntity>(TEntity entity) where TEntity : BaseEntity
         {
@@ -550,7 +553,6 @@ public int DetachEntities<TEntity>(bool unchangedEntitiesOnly = true) where TEnt
 
 		public void ChangeState<TEntity>(TEntity entity, System.Data.Entity.EntityState newState) where TEntity : BaseEntity
 		{
-			Console.WriteLine("ChangeState ORIGINAL");
 			this.Entry(entity).State = newState;
 		}
 
@@ -559,6 +561,11 @@ public void ReloadEntity<TEntity>(TEntity entity) where TEntity : BaseEntity
 			this.Entry(entity).Reload();
 		}
 
+		internal ObjectContext ObjectContext
+		{
+			get { return ((IObjectContextAdapter)this).ObjectContext; }
+		}
+
 		private string FormatValidationExceptionMessage(IEnumerable<DbEntityValidationResult> results)
         {
             var sb = new StringBuilder();

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using SmartStore.Core.Data;`
`17`	`17`	`using SmartStore.Core.Data.Hooks;`
`18`	`18`	`using SmartStore.Core.Events;`
	`19`	`+using System.Data.Entity.Core.Objects;`
`19`	`20`
`20`	`21`	`namespace SmartStore.Data`
`21`	`22`	`{`
`@@ -138,7 +139,7 @@ public bool HooksEnabled`
`138`	`139`
`139`	`140`	`public virtual string CreateDatabaseScript()`
`140`	`141`	`{`
`141`		`- return ((IObjectContextAdapter)this).ObjectContext.CreateDatabaseScript();`
	`142`	`+ return ObjectContext.CreateDatabaseScript();`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`public new DbSet<TEntity> Set<TEntity>() where TEntity : BaseEntity`
`@@ -219,7 +220,7 @@ private IEnumerable<DbParameter> ToParameters(params object[] parameters)`
`219`	`220`
`220`	`221`	`// database call`
`221`	`222`	`var reader = cmd.ExecuteReader();`
`222`		`- var result = ((IObjectContextAdapter)(this)).ObjectContext.Translate<TEntity>(reader).ToList();`
	`223`	`+ var result = ObjectContext.Translate<TEntity>(reader).ToList();`
`223`	`224`	`if (!ForceNoTracking)`
`224`	`225`	`{`
`225`	`226`	`for (int i = 0; i < result.Count; i++)`
`@@ -263,8 +264,8 @@ public int ExecuteSqlCommand(string sql, bool doNotEnsureTransaction = false, in`
`263`	`264`	`if (timeout.HasValue)`
`264`	`265`	`{`
`265`	`266`	`//store previous timeout`
`266`		`- previousTimeout = ((IObjectContextAdapter)this).ObjectContext.CommandTimeout;`
`267`		`- ((IObjectContextAdapter)this).ObjectContext.CommandTimeout = timeout;`
	`267`	`+ previousTimeout = ObjectContext.CommandTimeout;`
	`268`	`+ ObjectContext.CommandTimeout = timeout;`
`268`	`269`	`}`
`269`	`270`
`270`	`271`	`var transactionalBehavior = doNotEnsureTransaction`
`@@ -275,7 +276,7 @@ public int ExecuteSqlCommand(string sql, bool doNotEnsureTransaction = false, in`
`275`	`276`	`if (timeout.HasValue)`
`276`	`277`	`{`
`277`	`278`	`//Set previous timeout back`
`278`		`- ((IObjectContextAdapter)this).ObjectContext.CommandTimeout = previousTimeout;`
	`279`	`+ ObjectContext.CommandTimeout = previousTimeout;`
`279`	`280`	`}`
`280`	`281`
`281`	`282`	`return result;`
`@@ -498,27 +499,29 @@ protected internal bool IsSqlServer2012OrHigher()`
`498`	`499`
`499`	`500`	`public TEntity Attach<TEntity>(TEntity entity) where TEntity : BaseEntity`
`500`	`501`	`{`
`501`		`- var dbSet = Set<TEntity>();`
`502`		`- var alreadyAttached = dbSet.Local.FirstOrDefault(x => x.Id == entity.Id);`
`503`		`-`
`504`		`- if (alreadyAttached == null)`
	`502`	`+ ObjectStateEntry entry;`
	`503`	`+ if (ObjectContext.ObjectStateManager.TryGetObjectStateEntry(entity, out entry))`
`505`	`504`	`{`
`506`		`- dbSet.Attach(entity);`
`507`		`- return entity;`
	`505`	`+ if (entry.State != System.Data.Entity.EntityState.Detached)`
	`506`	`+ {`
	`507`	`+ return (TEntity)entry.Entity;`
	`508`	`+ }`
`508`	`509`	`}`
`509`	`510`
`510`		`- return alreadyAttached;`
	`511`	`+ Set<TEntity>().Attach(entity);`
	`512`	`+ return entity;`
`511`	`513`	`}`
`512`	`514`
`513`	`515`	`public bool IsAttached<TEntity>(TEntity entity) where TEntity : BaseEntity`
`514`	`516`	`{`
`515`		`- if (entity != null)`
	`517`	`+ ObjectStateEntry entry;`
	`518`	`+ if (ObjectContext.ObjectStateManager.TryGetObjectStateEntry(entity, out entry))`
`516`	`519`	`{`
`517`		`- return Set<TEntity>().Local.Any(x => x.Id == entity.Id);`
	`520`	`+ return (entry.State != System.Data.Entity.EntityState.Detached);`
`518`	`521`	`}`
`519`		`-`
	`522`	`+`
`520`	`523`	`return false;`
`521`		`- }`
	`524`	`+ }`
`522`	`525`
`523`	`526`	`public void DetachEntity<TEntity>(TEntity entity) where TEntity : BaseEntity`
`524`	`527`	`{`
`@@ -550,7 +553,6 @@ public int DetachEntities<TEntity>(bool unchangedEntitiesOnly = true) where TEnt`
`550`	`553`
`551`	`554`	`public void ChangeState<TEntity>(TEntity entity, System.Data.Entity.EntityState newState) where TEntity : BaseEntity`
`552`	`555`	`{`
`553`		`- Console.WriteLine("ChangeState ORIGINAL");`
`554`	`556`	`this.Entry(entity).State = newState;`
`555`	`557`	`}`
`556`	`558`
`@@ -559,6 +561,11 @@ public void ReloadEntity<TEntity>(TEntity entity) where TEntity : BaseEntity`
`559`	`561`	`this.Entry(entity).Reload();`
`560`	`562`	`}`
`561`	`563`
	`564`	`+ internal ObjectContext ObjectContext`
	`565`	`+ {`
	`566`	`+ get { return ((IObjectContextAdapter)this).ObjectContext; }`
	`567`	`+ }`
	`568`	`+`
`562`	`569`	`private string FormatValidationExceptionMessage(IEnumerable<DbEntityValidationResult> results)`
`563`	`570`	`{`
`564`	`571`	`var sb = new StringBuilder();`