Merge pull request #219 from linq2db/version3

Release 3.18.0
linq2db · Apr 8, 2022 · c21b399 · c21b399
2 parents 08d71c5 + 2c64d3e
commit c21b399
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 17 deletions.
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>3.17.0</Version>
+		<Version>3.18.0</Version>
 
 		<Authors>Svyatoslav Danyliv, Igor Tkachev, Dmitry Lukashenko, Ilya Chudin</Authors>
 		<Product>Linq to DB</Product>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,15 +5,15 @@
 		<PackageVersion Include="NUnit" Version="3.13.2" />
 		<PackageVersion Include="FluentAssertions" Version="5.10.3" />
 
-		<PackageVersion Include="linq2db" Version="3.5.2" />
-		<PackageVersion Include="linq2db.Tools" Version="3.5.2" />
+		<PackageVersion Include="linq2db" Version="3.7.0" />
+		<PackageVersion Include="linq2db.Tools" Version="3.7.0" />
 
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 		<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
 
 
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.21" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.21" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.6" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.6" />
 
 		<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0" />
 		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />

diff --git a/NuGet/linq2db.EntityFrameworkCore.nuspec b/NuGet/linq2db.EntityFrameworkCore.nuspec
@@ -15,8 +15,8 @@
 		<license type="file">MIT-LICENSE.txt</license>
 		<dependencies>
 			<group targetFramework=".NETStandard2.0">
-				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="3.1.21" />
-				<dependency id="linq2db" version="3.5.2" />
+				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="3.1.6" />
+				<dependency id="linq2db" version="3.7.0" />
 			</group>
 		</dependencies>
 	</metadata>

diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -772,12 +772,24 @@ public virtual Expression TransformExpression(Expression expression, IDataContex
 			var tracking           = true;
 			var ignoreTracking     = false;
 
+			var nonEvaluatableParameters = new HashSet<ParameterExpression>();
+
 			TransformInfo LocalTransform(Expression e)
 			{
 				e = CompactExpression(e);
 
 				switch (e.NodeType)
 				{
+					case ExpressionType.Lambda:
+					{
+						foreach (var parameter in ((LambdaExpression)e).Parameters)
+						{
+							nonEvaluatableParameters.Add(parameter);
+						}
+
+						break;
+					}
+
 					case ExpressionType.Constant:
 					{
 						if (dc != null && typeof(EntityQueryable<>).IsSameOrParentOf(e.Type) || typeof(DbSet<>).IsSameOrParentOf(e.Type))
@@ -919,14 +931,18 @@ TransformInfo LocalTransform(Expression e)
 
 						if (typeof(IQueryable<>).IsSameOrParentOf(methodCall.Type))
 						{
-							// Invoking function to evaluate EF's Subquery located in function
-
-							var obj = EvaluateExpression(methodCall.Object);
-							var arguments = methodCall.Arguments.Select(EvaluateExpression).ToArray();
-							if (methodCall.Method.Invoke(obj, arguments) is IQueryable result)
+							if (null == methodCall.Find(nonEvaluatableParameters,
+								    (c, t) => t.NodeType == ExpressionType.Parameter && c.Contains(t)))
 							{
-								if (!ExpressionEqualityComparer.Instance.Equals(methodCall, result.Expression))
-									return new TransformInfo(result.Expression, false, true);
+								// Invoking function to evaluate EF's Subquery located in function
+
+								var obj = EvaluateExpression(methodCall.Object);
+								var arguments = methodCall.Arguments.Select(EvaluateExpression).ToArray();
+								if (methodCall.Method.Invoke(obj, arguments) is IQueryable result)
+								{
+									if (!ExpressionEqualityComparer.Instance.Equals(methodCall, result.Expression))
+										return new TransformInfo(result.Expression, false, true);
+								}
 							}
 						}
 

diff --git a/...qToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/NpgSqlEnititesContext.cs b/...qToDB.EntityFrameworkCore.PostgreSQL.Tests/Models/NpgSqlEntities/NpgSqlEnititesContext.cs
@@ -20,6 +20,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 					entity.HasNoKey();
 					entity.ToView("EventsView", "views");
 				});
+
+			modelBuilder.Entity<EntityWithArrays>(entity =>
+			{
+			});
 		}
 
 		public virtual DbSet<Event> Events { get; set; } = null!;

diff --git a/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/NpgSqlTests.cs b/Tests/LinqToDB.EntityFrameworkCore.PostgreSQL.Tests/NpgSqlTests.cs
@@ -87,5 +87,23 @@ where Sql.Ext.PostgreSQL().Overlaps(m.Guids, guids)
 			}
 		}
 
+		[Test]
+		public void TestUnnest()
+		{
+			using var db = CreateNpgSqlEntitiesContext();
+			using var dc = db.CreateLinqToDbConnection();
+
+			var guids = new Guid[] { Guid.Parse("271425b1-ebe8-400d-b71d-a6e47a460ae3"),
+				Guid.Parse("b75de94e-6d7b-4c70-bfa1-f8639a6a5b35") };
+
+			var query = 
+				from m in db.EntityWithArrays.ToLinqToDBTable()
+				from g in dc.Unnest(m.Guids) 
+				where Sql.Ext.PostgreSQL().Overlaps(m.Guids, guids)
+				select m;
+
+			query.Invoking(q => q.ToArray()).Should().NotThrow();
+		}
+
 	}
 }
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,8 +1,8 @@
 variables:
   solution: 'linq2db.EFCore.sln'
   build_configuration: 'Release'
-  assemblyVersion: 3.17.0
-  nugetVersion: 3.17.0
+  assemblyVersion: 3.18.0
+  nugetVersion: 3.18.0
   artifact_nugets: 'nugets'
 
 # build on commits to important branches (master + release branches):
@@ -26,7 +26,7 @@ stages:
   jobs:
   - job: build_job
     pool:
-      vmImage: 'windows-2019'
+      vmImage: 'windows-2022'
     variables:
       packageVersion: $(nugetVersion)
     displayName: 'Build'