- 移除 In多表表达式函数解析 #243；

- 调整 SafeObjectPool 源码移入项目；
dotnetcore · Mar 20, 2020 · 7278159 · 7278159
1 parent 25312ce
commit 7278159
Show file tree

Hide file tree

Showing 49 changed files with 1,138 additions and 174 deletions.
diff --git a/Examples/dbcontext_01/Program.cs b/Examples/dbcontext_01/Program.cs
@@ -40,7 +40,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder builder)
         static IFreeSql fsql;
         public static void Main(string[] args)
         {
-            var asse = typeof(SafeObjectPool.ObjectPool<>).Assembly;
+            var asse = typeof(FreeSql.Internal.ObjectPool.ObjectPool<>).Assembly;
 
             fsql = new FreeSql.FreeSqlBuilder()
                 .UseConnectionString(FreeSql.DataType.Sqlite, @"Data Source=|DataDirectory|\dd2.db;Pooling=true;Max Pool Size=10")

diff --git a/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs b/FreeSql.DbContext/UnitOfWork/UnitOfWork.cs
@@ -1,4 +1,4 @@
-using SafeObjectPool;
+using FreeSql.Internal.ObjectPool;
 using System;
 using System.Collections.Generic;
 using System.Collections.Concurrent;

diff --git a/FreeSql/Extensions/FreeSqlGlobalExpressionCall.cs b/FreeSql/Extensions/FreeSqlGlobalExpressionCall.cs
@@ -1,16 +1,5 @@
-using FreeSql;
-using FreeSql.DataAnnotations;
+using FreeSql.DataAnnotations;
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
 using System.Threading;
 
 [ExpressionCall]
@@ -50,83 +39,4 @@ public static bool BetweenEnd(this DateTime that, DateTime start, DateTime end)
         expContext.Value.Result = $"{expContext.Value.ParsedContent["that"]} >= {expContext.Value.ParsedContent["start"]} and {expContext.Value.ParsedContent["that"]} < {expContext.Value.ParsedContent["end"]}";
         return false;
     }
-
-#if netcoreapp
-    /// <summary>
-    /// C#：从元组集合中查找 exp1, exp2 是否存在<para></para>
-    /// SQL： <para></para>
-    /// exp1 = that[0].Item1 and exp2 = that[0].Item2 OR <para></para>
-    /// exp1 = that[1].Item1 and exp2 = that[1].Item2 OR <para></para>
-    /// ... <para></para>
-    /// 注意：当 that 为 null 或 empty 时，返回 1=0
-    /// </summary>
-    /// <typeparam name="T1"></typeparam>
-    /// <typeparam name="T2"></typeparam>
-    /// <param name="that"></param>
-    /// <param name="exp1"></param>
-    /// <param name="exp2"></param>
-    /// <returns></returns>
-    public static bool Contains<T1, T2>([RawValue] this IEnumerable<(T1, T2)> that, T1 exp1, T2 exp2)
-    {
-        if (expContext.IsValueCreated == false || expContext.Value == null || expContext.Value.ParsedContent == null)
-            return that?.Any(a => a.Item1.Equals(exp1) && a.Item2.Equals(exp2)) == true;
-        if (that?.Any() != true)
-        {
-            expContext.Value.Result = "1=0";
-            return false;
-        }
-        var sb = new StringBuilder();
-        var idx = 0;
-        foreach (var item in that)
-        {
-            if (idx++ > 0) sb.Append(" OR \r\n");
-            sb
-                .Append(expContext.Value.ParsedContent["exp1"]).Append(" = ").Append(expContext.Value.FormatSql(FreeSql.Internal.Utils.GetDataReaderValue(typeof(T1), item.Item1)))
-                .Append(" AND ")
-                .Append(expContext.Value.ParsedContent["exp2"]).Append(" = ").Append(expContext.Value.FormatSql(FreeSql.Internal.Utils.GetDataReaderValue(typeof(T2), item.Item2)));
-        }
-        expContext.Value.Result = sb.ToString();
-        return true;
-    }
-    /// <summary>
-    /// C#：从元组集合中查找 exp1, exp2, exp2 是否存在<para></para>
-    /// SQL： <para></para>
-    /// exp1 = that[0].Item1 and exp2 = that[0].Item2 and exp3 = that[0].Item3 OR <para></para>
-    /// exp1 = that[1].Item1 and exp2 = that[1].Item2 and exp3 = that[1].Item3 OR <para></para>
-    /// ... <para></para>
-    /// 注意：当 that 为 null 或 empty 时，返回 1=0
-    /// </summary>
-    /// <typeparam name="T1"></typeparam>
-    /// <typeparam name="T2"></typeparam>
-    /// <typeparam name="T3"></typeparam>
-    /// <param name="that"></param>
-    /// <param name="exp1"></param>
-    /// <param name="exp2"></param>
-    /// <param name="exp3"></param>
-    /// <returns></returns>
-    public static bool Contains<T1, T2, T3>([RawValue] this IEnumerable<(T1, T2, T3)> that, T1 exp1, T2 exp2, T3 exp3)
-    {
-        if (expContext.IsValueCreated == false || expContext.Value == null || expContext.Value.ParsedContent == null)
-            return that.Any(a => a.Item1.Equals(exp1) && a.Item2.Equals(exp2) && a.Item3.Equals(exp3));
-        if (that.Any() == false)
-        {
-            expContext.Value.Result = "1=0";
-            return false;
-        }
-        var sb = new StringBuilder();
-        var idx = 0;
-        foreach (var item in that)
-        {
-            if (idx++ > 0) sb.Append(" OR \r\n");
-            sb
-                .Append(expContext.Value.ParsedContent["exp1"]).Append(" = ").Append(expContext.Value.FormatSql(FreeSql.Internal.Utils.GetDataReaderValue(typeof(T1), item.Item1)))
-                .Append(" AND ")
-                .Append(expContext.Value.ParsedContent["exp2"]).Append(" = ").Append(expContext.Value.FormatSql(FreeSql.Internal.Utils.GetDataReaderValue(typeof(T2), item.Item2)))
-                .Append(" AND ")
-                .Append(expContext.Value.ParsedContent["exp3"]).Append(" = ").Append(expContext.Value.FormatSql(FreeSql.Internal.Utils.GetDataReaderValue(typeof(T3), item.Item3)));
-        }
-        expContext.Value.Result = sb.ToString();
-        return true;
-    }
-#endif
 }
diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netcoreapp31;netcoreapp30;netcoreapp22;netcoreapp21;net45;net40</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
 		<Version>1.3.0-preview10</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>YeXiangQin</Authors>
@@ -30,13 +30,6 @@
 	  <WarningLevel>3</WarningLevel>
 	</PropertyGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="SafeObjectPool" Version="2.3.1" />
-	</ItemGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp31' or '$(TargetFramework)' == 'netcoreapp30' or '$(TargetFramework)' == 'netcoreapp22' or '$(TargetFramework)' == 'netcoreapp21'">
-    <DefineConstants>netcoreapp</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net40'">
     <DefineConstants>net40</DefineConstants>
   </PropertyGroup>