lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-09-23 20:43:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

UpdateCore

Browse Source
This commit is contained in:
sunkaixuan
2019-04-10 21:00:32 +08:00
parent d345cb7aa3
commit 1d50f545da
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/Abstract/SaveableProvider/SaveableProvider.cs
View File

@@ -34,7 +34,7 @@ namespace SqlSugar
var pks = GetPrimaryKeys(); var pks = GetPrimaryKeys();
Check.Exception(pks.IsNullOrEmpty(), "Need primary key"); Check.Exception(pks.IsNullOrEmpty(), "Need primary key");
Check.Exception(pks.Count() > 1, "Multiple primary keys are not supported"); Check.Exception(pks.Count() > 1, "Multiple primary keys are not supported");
var pkInfo = this.EntityInfo.Columns.Where(it => it.DbColumnName.Equals(pks.First(), StringComparison.CurrentCultureIgnoreCase)).First(); var pkInfo = this.EntityInfo.Columns.Where(it=>it.IsIgnore==false).Where(it => it.DbColumnName.Equals(pks.First(), StringComparison.CurrentCultureIgnoreCase)).First();
var pkValues = saveObjects.Select(it=>it.GetType().GetProperty(pkInfo.PropertyName).GetValue(it,null)); var pkValues = saveObjects.Select(it=>it.GetType().GetProperty(pkInfo.PropertyName).GetValue(it,null));
if(existsObjects==null) if(existsObjects==null)
existsObjects=this.Context.Queryable<T>().In(pkValues).ToList(); existsObjects=this.Context.Queryable<T>().In(pkValues).ToList();
@@ -56,7 +56,7 @@ namespace SqlSugar
var pks = GetPrimaryKeys(); var pks = GetPrimaryKeys();
Check.Exception(pks.IsNullOrEmpty(), "Need primary key"); Check.Exception(pks.IsNullOrEmpty(), "Need primary key");
Check.Exception(pks.Count() > 1, "Multiple primary keys are not supported"); Check.Exception(pks.Count() > 1, "Multiple primary keys are not supported");
var pkInfo = this.EntityInfo.Columns.Where(it => it.DbColumnName.Equals(pks.First(), StringComparison.CurrentCultureIgnoreCase)).First(); var pkInfo = this.EntityInfo.Columns.Where(it => it.IsIgnore == false).Where(it => it.DbColumnName.Equals(pks.First(), StringComparison.CurrentCultureIgnoreCase)).First();
var pkValues = saveObjects.Select(it => it.GetType().GetProperty(pkInfo.PropertyName).GetValue(it, null)); var pkValues = saveObjects.Select(it => it.GetType().GetProperty(pkInfo.PropertyName).GetValue(it, null));
if (existsObjects == null) if (existsObjects == null)
existsObjects = this.Context.Queryable<T>().In(pkValues).ToList(); existsObjects = this.Context.Queryable<T>().In(pkValues).ToList();

5
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SimpleClient.cs
View File

@@ -24,6 +24,10 @@ namespace SqlSugar
{ {
return Context.Queryable<T>().InSingle(id); return Context.Queryable<T>().InSingle(id);
} }
public int Count<T>(Expression<Func<T, bool>> whereExpression)
{
return Context.Queryable<T>().Where(whereExpression).Count();
}
public List<T> GetList<T>() where T : class, new() public List<T> GetList<T>() where T : class, new()
{ {
return Context.Queryable<T>().ToList(); return Context.Queryable<T>().ToList();
@@ -172,6 +176,7 @@ namespace SqlSugar
{ {
return Context.Queryable<T>().ToList(); return Context.Queryable<T>().ToList();
} }
public List<T> GetList(Expression<Func<T, bool>> whereExpression) public List<T> GetList(Expression<Func<T, bool>> whereExpression)
{ {
return Context.Queryable<T>().Where(whereExpression).ToList(); return Context.Queryable<T>().Where(whereExpression).ToList();

6
Src/Asp.NetCore2/SqlSeverTest/SqlSugar/SqlSugarClient.cs
View File

@@ -5,6 +5,7 @@ using System.Dynamic;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace SqlSugar namespace SqlSugar
{ {
@@ -835,7 +836,10 @@ namespace SqlSugar
var newName = itemParameter.ParameterName + "_q_" + index; var newName = itemParameter.ParameterName + "_q_" + index;
SugarParameter parameter = new SugarParameter(newName, itemParameter.Value); SugarParameter parameter = new SugarParameter(newName, itemParameter.Value);
parameter.DbType = itemParameter.DbType; parameter.DbType = itemParameter.DbType;
itemSql = itemSql.Replace(itemParameter.ParameterName, newName); itemSql = Regex.Replace(itemSql,string.Format(@"{0} ","\\"+itemParameter.ParameterName), newName+" ");
itemSql = Regex.Replace(itemSql, string.Format(@"{0}\)", "\\" + itemParameter.ParameterName), newName+")");
itemSql = Regex.Replace(itemSql, string.Format(@"{0}\,", "\\" + itemParameter.ParameterName), newName+",");
itemSql = Regex.Replace(itemSql, string.Format(@"{0}$", "\\" + itemParameter.ParameterName), newName);
addParameters.Add(parameter); addParameters.Add(parameter);
} }
parsmeters.AddRange(addParameters); parsmeters.AddRange(addParameters);