tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-11-04 09:15:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 增加 IN 参数扩展 where id in @ids；#560

Browse Source
This commit is contained in:
2881099
2020-11-24 00:17:12 +08:00
parent c9a1e2a7b8
commit 3aec26337a
17 changed files with 322 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
View File

@@ -1,14 +1,16 @@
using FreeSql.Internal.ObjectPool;
using FreeSql.Internal.Model;
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections.Generic;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Reflection;
using FreeSql.Internal.Model;
using System.Text;
using System.Text.RegularExpressions;
namespace FreeSql.Internal.CommonProvider
{
@@ -849,8 +851,24 @@ namespace FreeSql.Internal.CommonProvider
foreach (var parm in cmdParms)
{
if (parm == null) continue;
var isnew = false;
if (parm.Value == null) parm.Value = DBNull.Value;
cmd.Parameters.Add(parm);
else
{
if (parm.Value is Array || parm.Value is IList)
{
cmd.CommandText = Regex.Replace(cmd.CommandText, @"\s+(in|In|IN|iN)\s+[\:\?\@]" + parm.ParameterName.TrimStart('@', '?', ':'), m =>
{
isnew = true;
var arr = parm.Value as IEnumerable;
if (arr == null) return " IS NULL";
var vals = new List<object>();
foreach (var val in arr) vals.Add(val);
return $" in {_util.FormatSql("{0}", new object[] { vals })}";
});
}
}
if (isnew == false) cmd.Parameters.Add(parm);
}
}

20
FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderAsync.cs
View File

@@ -1,11 +1,13 @@
using FreeSql.Internal.Model;
using FreeSql.Internal.ObjectPool;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
@@ -755,8 +757,24 @@ namespace FreeSql.Internal.CommonProvider
foreach (var parm in cmdParms)
{
if (parm == null) continue;
var isnew = false;
if (parm.Value == null) parm.Value = DBNull.Value;
cmd.Parameters.Add(parm);
else
{
if (parm.Value is Array || parm.Value is IList)
{
cmd.CommandText = Regex.Replace(cmd.CommandText, @"\s+(in|In|IN|iN)\s+[\:\?\@]" + parm.ParameterName.TrimStart('@', '?', ':'), m =>
{
isnew = true;
var arr = parm.Value as IEnumerable;
if (arr == null) return " IS NULL";
var vals = new List<object>();
foreach (var val in arr) vals.Add(val);
return $" in {_util.FormatSql("{0}", new object[] { vals })}";
});
}
}
if (isnew == false) cmd.Parameters.Add(parm);
}
}