Merge pull request #132 from Lempireqc/master

JonathanMagnan · web-flow · commit 1b772b2dca12 · 2018-08-31T13:35:22.000-04:00
fix clearTable and Add IsCaseSensitive in connection
diff --git a/Main/Source/Effort.Shared/DbConnectionFactory.cs b/Main/Source/Effort.Shared/DbConnectionFactory.cs
@@ -113,7 +113,7 @@ public static DbConnection CreatePersistent(string instanceId)
         /// <returns>
         ///     The <see cref="T:DbConnection"/> object.
         /// </returns>
-        public static DbConnection CreateTransient(IDataLoader dataLoader)
+        public static EffortConnection CreateTransient(IDataLoader dataLoader)
         {
             string instanceId = Guid.NewGuid().ToString();
 
@@ -132,7 +132,7 @@ public static DbConnection CreateTransient(IDataLoader dataLoader)
         /// <returns>
         ///     The <see cref="T:DbConnection"/> object.
         /// </returns>
-        public static DbConnection CreateTransient()
+        public static EffortConnection CreateTransient()
         {
             return CreateTransient(null);
         }
diff --git a/Main/Source/Effort.Shared/Internal/CommandActions/DbCommandActionHelper.cs b/Main/Source/Effort.Shared/Internal/CommandActions/DbCommandActionHelper.cs
@@ -121,7 +121,7 @@ public static Expression GetEnumeratorExpression(
             DbContainer container, 
             out ITable table)
         {
-            TransformVisitor visitor = new TransformVisitor(container.TypeConverter);
+            TransformVisitor visitor = new TransformVisitor(container);
             visitor.TableProvider = container;
 
             // Get the source expression
diff --git a/Main/Source/Effort.Shared/Internal/CommandActions/InsertCommandAction.cs b/Main/Source/Effort.Shared/Internal/CommandActions/InsertCommandAction.cs
@@ -63,7 +63,7 @@ public DbDataReader ExecuteDataReader(ActionContext context)
 
             // Collection for collection member bindings
             IList<MemberBinding> memberBindings = new List<MemberBinding>();
-            TransformVisitor transform = new TransformVisitor(context.DbContainer.TypeConverter);
+            TransformVisitor transform = new TransformVisitor(context.DbContainer);
 
             // Initialize member bindings
             foreach (PropertyInfo property in table.EntityType.GetProperties())
@@ -110,7 +110,7 @@ public int ExecuteNonQuery(ActionContext context)
 
             // Collection for collection member bindings
             IList<MemberBinding> memberBindings = new List<MemberBinding>();
-            TransformVisitor transform = new TransformVisitor(context.DbContainer.TypeConverter);
+            TransformVisitor transform = new TransformVisitor(context.DbContainer);
 
             // Initialize member bindings
             foreach (PropertyInfo property in table.EntityType.GetProperties())
diff --git a/Main/Source/Effort.Shared/Internal/CommandActions/QueryCommandAction.cs b/Main/Source/Effort.Shared/Internal/CommandActions/QueryCommandAction.cs
@@ -54,7 +54,7 @@ public QueryCommandAction(DbQueryCommandTree commandTree)
 
         public DbDataReader ExecuteDataReader(ActionContext context)
         {
-            TransformVisitor visitor = new TransformVisitor(context.DbContainer.TypeConverter);
+            TransformVisitor visitor = new TransformVisitor(context.DbContainer);
             visitor.TableProvider = context.DbContainer;
 
             // Transform command tree
diff --git a/Main/Source/Effort.Shared/Internal/CommandActions/UpdateCommandAction.cs b/Main/Source/Effort.Shared/Internal/CommandActions/UpdateCommandAction.cs
@@ -67,7 +67,7 @@ public DbDataReader ExecuteDataReader(ActionContext context)
             // Collection for collection member bindings
             IList<MemberBinding> memberBindings = new List<MemberBinding>();
 
-            TransformVisitor transform = new TransformVisitor(context.DbContainer.TypeConverter);
+            TransformVisitor transform = new TransformVisitor(context.DbContainer);
 
             // Setup context for the predicate
             ParameterExpression param = Expression.Parameter(type, "context");
@@ -134,7 +134,7 @@ public int ExecuteNonQuery(ActionContext context)
             // Collection for collection member bindings
             IList<MemberBinding> memberBindings = new List<MemberBinding>();
 
-            TransformVisitor transform = new TransformVisitor(context.DbContainer.TypeConverter);
+            TransformVisitor transform = new TransformVisitor(context.DbContainer);
 
             // Setup context for the predicate
             ParameterExpression param = Expression.Parameter(type, "context");
diff --git a/Main/Source/Effort.Shared/Internal/DbCommandTreeTransformation/TransformVisitor.Comparison.cs b/Main/Source/Effort.Shared/Internal/DbCommandTreeTransformation/TransformVisitor.Comparison.cs
@@ -86,6 +86,11 @@ private Expression CreateComparison(Expression left, Expression right, DbExpress
 
         private Expression CreateStringComparison(Expression left, Expression right, DbExpressionKind kind)
         {
+             if (this.container.IsCaseSensitive == false)
+            {
+                left = Expression.Call(null, StringFunctions.ToLower, left);
+                right = Expression.Call(null, StringFunctions.ToLower, right);
+            }
             var method = Expression.Call(null, StringFunctions.CompareTo, left, right);
             var mode = GetCompareMode(kind);
 
@@ -136,4 +141,4 @@ private Tuple<int, bool> GetCompareMode(DbExpressionKind kind)
                 "The ExpressionKind cannot be " + kind.ToString());
         }
     }
-}
+}
diff --git a/Main/Source/Effort.Shared/Internal/DbCommandTreeTransformation/TransformVisitor.cs b/Main/Source/Effort.Shared/Internal/DbCommandTreeTransformation/TransformVisitor.cs
@@ -26,6 +26,7 @@ namespace Effort.Internal.DbCommandTreeTransformation
 {
     using System;
     using System.Collections.Generic;
+    using Effort.Internal.DbManagement;
 #if !EFOLD
     using System.Data.Entity.Core.Common.CommandTrees;
     using System.Data.Entity.Core.Metadata.Edm;
@@ -55,10 +56,12 @@ internal partial class TransformVisitor : DbExpressionVisitor<Expression>
         private EdmTypeConverter edmTypeConverter;
 
         private VariableCollection currentVariables;
+        private DbContainer container;
 
-        public TransformVisitor(ITypeConverter converter)
+        public TransformVisitor(DbContainer container)
         {
-            this.converter = converter;
+            this.container = container;
+            this.converter = container.TypeConverter;
             this.edmTypeConverter = new EdmTypeConverter(converter);
 
             this.queryMethodExpressionBuilder = new LinqMethodExpressionBuilder();
diff --git a/Main/Source/Effort.Shared/Internal/DbManagement/DbContainer.cs b/Main/Source/Effort.Shared/Internal/DbManagement/DbContainer.cs
@@ -54,7 +54,6 @@ internal class DbContainer : ITableProvider
         private List<TableName> tableNames;
         private ITypeConverter converter;
         private DbContainerParameters parameters;
-
         private ILogger logger;
         private ConcurrentDictionary<string, IStoredProcedure> transformCache;
 
@@ -92,6 +91,8 @@ public ConcurrentDictionary<string, IStoredProcedure> TransformCache
         {
             get { return this.transformCache; }
         }
+        
+        public bool IsCaseSensitive { get; set; } = true;
 
         public ITypeConverter TypeConverter
         {
diff --git a/Main/Source/Effort.Shared/Provider/EffortConnection.cs b/Main/Source/Effort.Shared/Provider/EffortConnection.cs
@@ -22,6 +22,8 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------
 
+
+using System.Data.Entity;
 using System.Linq;
 using System.Reflection;
 using Effort.Internal.CommandActions;
@@ -59,22 +61,60 @@ public EffortConnection()
             this.state = ConnectionState.Closed;
         }
         
+        public bool IsCaseSensitive
+        {
+            get
+            {
+                if (this.DbContainer != null)
+                {
+                    return this.DbContainer.IsCaseSensitive;
+                }
+                else
+                {
+                    throw new Exception("The connection must be open to gets or sets 'IsCaseSensitive' value. Please open the connection first with 'effortConnection.Open()'");
+                }
+            }
+            set
+            {
+                if (this.DbContainer != null)
+                {
+                    this.DbContainer.IsCaseSensitive = value;
+                }
+                else
+                {
+                    throw new Exception("The connection must be open to gets or sets 'IsCaseSensitive' value. Please open the connection first with 'effortConnection.Open()'");
+                }
+            }
+        }
+
+#if !EFOLD
+        /// <summary>
+        ///     Clear all tables from the effort connection. You must use a new context instance to clear all tracked entities, otherwise, use the ClearTables(DbContext) overload.
+        /// </summary>
         public void ClearTables()
-        { 
+        {
+            ClearTables(null);
+        }
+
+        /// <summary>
+        ///     Clear all tables from the effort connection and ChangeTracker entries.
+        /// </summary>
+        public void ClearTables(DbContext context)
+        {
             if (this.DbContainer != null)
-            { 
-                ActionContext context = new ActionContext(this.DbContainer); 
+            {
+                ActionContext actionContext = new ActionContext(this.DbContainer);
 
-                var tables = DbCommandActionHelper.GetAllTables(context.DbContainer).ToList().Where(x => !x.EntityType.Name.Contains("_____MigrationHistory")).ToList();
+                var tables = DbCommandActionHelper.GetAllTables(actionContext.DbContainer).ToList().Where(x => !x.EntityType.Name.Contains("_____MigrationHistory")).ToList();
 
                 foreach (var table in tables)
                 {
                     foreach (var index in table.Indexes)
-                    { 
+                    {
                         index.Clear();
                     }
 
-                    var _RestoreIdentityField =  table.GetType().GetMethod("RestoreIdentityField",
+                    var _RestoreIdentityField = table.GetType().GetMethod("RestoreIdentityField",
                         BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static |
                         BindingFlags.FlattenHierarchy);
 
@@ -85,9 +125,19 @@ public void ClearTables()
                             BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static |
                             BindingFlags.FlattenHierarchy, null, null, null);
                     }
-                } 
+                }
+
+                if (context != null)
+                {
+                    var changedEntriesCopy = context.ChangeTracker.Entries()
+                        .ToList();
+
+                    foreach (var entry in changedEntriesCopy)
+                        entry.State = EntityState.Detached;
+                }
             }
         }
+#endif
 
         /// <summary>
         ///     Gets or sets the string used to open the connection.
diff --git a/Main/Source/Effort.Test.EF6/Features/StringFieldFixture.cs b/Main/Source/Effort.Test.EF6/Features/StringFieldFixture.cs

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public static DbConnection CreatePersistent(string instanceId)`
`113`	`113`	`/// <returns>`
`114`	`114`	`/// The <see cref="T:DbConnection"/> object.`
`115`	`115`	`/// </returns>`
`116`		`- public static DbConnection CreateTransient(IDataLoader dataLoader)`
	`116`	`+ public static EffortConnection CreateTransient(IDataLoader dataLoader)`
`117`	`117`	`{`
`118`	`118`	`string instanceId = Guid.NewGuid().ToString();`
`119`	`119`
`@@ -132,7 +132,7 @@ public static DbConnection CreateTransient(IDataLoader dataLoader)`
`132`	`132`	`/// <returns>`
`133`	`133`	`/// The <see cref="T:DbConnection"/> object.`
`134`	`134`	`/// </returns>`
`135`		`- public static DbConnection CreateTransient()`
	`135`	`+ public static EffortConnection CreateTransient()`
`136`	`136`	`{`
`137`	`137`	`return CreateTransient(null);`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public static Expression GetEnumeratorExpression(`
`121`	`121`	`DbContainer container,`
`122`	`122`	`out ITable table)`
`123`	`123`	`{`
`124`		`- TransformVisitor visitor = new TransformVisitor(container.TypeConverter);`
	`124`	`+ TransformVisitor visitor = new TransformVisitor(container);`
`125`	`125`	`visitor.TableProvider = container;`
`126`	`126`
`127`	`127`	`// Get the source expression`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public QueryCommandAction(DbQueryCommandTree commandTree)`
`54`	`54`
`55`	`55`	`public DbDataReader ExecuteDataReader(ActionContext context)`
`56`	`56`	`{`
`57`		`- TransformVisitor visitor = new TransformVisitor(context.DbContainer.TypeConverter);`
	`57`	`+ TransformVisitor visitor = new TransformVisitor(context.DbContainer);`
`58`	`58`	`visitor.TableProvider = context.DbContainer;`
`59`	`59`
`60`	`60`	`// Transform command tree`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,11 @@ private Expression CreateComparison(Expression left, Expression right, DbExpress`
`86`	`86`
`87`	`87`	`private Expression CreateStringComparison(Expression left, Expression right, DbExpressionKind kind)`
`88`	`88`	`{`
	`89`	`+ if (this.container.IsCaseSensitive == false)`
	`90`	`+ {`
	`91`	`+ left = Expression.Call(null, StringFunctions.ToLower, left);`
	`92`	`+ right = Expression.Call(null, StringFunctions.ToLower, right);`
	`93`	`+ }`
`89`	`94`	`var method = Expression.Call(null, StringFunctions.CompareTo, left, right);`
`90`	`95`	`var mode = GetCompareMode(kind);`
`91`	`96`
`@@ -136,4 +141,4 @@ private Tuple<int, bool> GetCompareMode(DbExpressionKind kind)`
`136`	`141`	`"The ExpressionKind cannot be " + kind.ToString());`
`137`	`142`	`}`
`138`	`143`	`}`
`139`		`-}`
	`144`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ internal class DbContainer : ITableProvider`
`54`	`54`	`private List<TableName> tableNames;`
`55`	`55`	`private ITypeConverter converter;`
`56`	`56`	`private DbContainerParameters parameters;`
`57`		`-`
`58`	`57`	`private ILogger logger;`
`59`	`58`	`private ConcurrentDictionary<string, IStoredProcedure> transformCache;`
`60`	`59`
`@@ -92,6 +91,8 @@ public ConcurrentDictionary<string, IStoredProcedure> TransformCache`
`92`	`91`	`{`
`93`	`92`	`get { return this.transformCache; }`
`94`	`93`	`}`
	`94`	`+`
	`95`	`+ public bool IsCaseSensitive { get; set; } = true;`
`95`	`96`
`96`	`97`	`public ITypeConverter TypeConverter`
`97`	`98`	`{`