diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs index 61ef3e394..cc2a19345 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs @@ -45,7 +45,7 @@ namespace SqlSugar } public virtual void InitTables(string entitiesNamespace) { - var types =ReflectionExtensions.LoadAssembly(entitiesNamespace).GetTypes(); + var types = ReflectionCore.Load(entitiesNamespace).GetTypes(); InitTables(types); } public virtual void InitTables(params string[] entitiesNamespaces) diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 2cb4f7abb..1a2881f36 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -795,14 +795,14 @@ namespace SqlSugar return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere,Expression> expression) { if (isWhere) _Where(expression); return this; } - public ISugarQueryable WhereIF(bool isWhere, Expression> expression) + public ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); @@ -1278,7 +1278,7 @@ namespace SqlSugar return this; } - public new ISugarQueryable WhereIF(bool isWhere, Expression> expression) + public new ISugarQueryable WhereIF(bool isWhere, Expression> expression) { if (isWhere) _Where(expression); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs index 45f07e956..592eec498 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Common/RewritableMethods.cs @@ -114,10 +114,6 @@ namespace SqlSugar } } var stringValue = SerializeObject(result); - if (stringValue.IsValuable()) - { - stringValue = stringValue.Replace(":{}", ":null"); - } reval.Add((T)DeserializeObject(stringValue)); } reader.Close(); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/InstanceFactory.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/InstanceFactory.cs index a70c6b528..4f848ab2d 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/InstanceFactory.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/InstanceFactory.cs @@ -8,7 +8,7 @@ namespace SqlSugar { public class InstanceFactory { - static Assembly assembly = ReflectionExtensions.LoadAssembly(PubConst.AssemblyName); + static Assembly assembly = ReflectionCore.Load(PubConst.AssemblyName); static Dictionary typeCache = new Dictionary(); #region Queryable diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IQueryable.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IQueryable.cs index 26b49a12d..23a7c3e52 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IQueryable.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Interface/IQueryable.cs @@ -15,7 +15,7 @@ namespace SqlSugar ISugarQueryable AS(string tableName); ISugarQueryable AS(string tableName); ISugarQueryable With(string withString); - ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter = false); + ISugarQueryable Filter(string FilterName, bool isDisabledGobalFilter= false); ISugarQueryable AddParameters(object pars); ISugarQueryable AddParameters(SugarParameter[] pars); ISugarQueryable AddJoinInfo(string tableName, string shortName, string joinWhere, JoinType type = JoinType.Left); @@ -57,7 +57,7 @@ namespace SqlSugar bool Any(Expression> expression); bool Any(); - + ISugarQueryable Select(Expression> expression); ISugarQueryable Select(string select) where TResult : class, new(); ISugarQueryable Select(string select); @@ -97,7 +97,7 @@ namespace SqlSugar new ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere,Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); #endregion @@ -122,7 +122,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); #endregion @@ -188,7 +188,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); @@ -228,7 +228,7 @@ namespace SqlSugar ISugarQueryable Where(Expression> expression); ISugarQueryable Where(Expression> expression); - ISugarQueryable WhereIF(bool isWhere, Expression> expression); + new ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); ISugarQueryable WhereIF(bool isWhere, Expression> expression); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/OnlyCore/ReflectionExtensions.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/OnlyCore/ReflectionExtensions.cs index 10c125b0d..39bd52df0 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/OnlyCore/ReflectionExtensions.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/OnlyCore/ReflectionExtensions.cs @@ -6,11 +6,11 @@ using System.Threading.Tasks; namespace SqlSugar { - public class ReflectionExtensions + public static class ReflectionCore { - public static Assembly LoadAssembly(string name) + public static Assembly Load(string name) { - return Assembly.Load(new AssemblyName(PubConst.AssemblyName)) ; + return Assembly.Load(new AssemblyName(PubConst.AssemblyName)); } } }