Revert "Minor enhancements in data layer"

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