Merge pull request #192 from linq2db/version6

sdanyliv · web-flow · commit 35bdda572484 · 2021-11-08T22:20:05.000+02:00
Release 6.5.0
diff --git a/Build/linq2db.Default.props b/Build/linq2db.Default.props
@@ -1,6 +1,6 @@
 ﻿<Project>
 	<PropertyGroup>
-		<Version>6.4.0</Version>
+		<Version>6.5.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,20 +5,20 @@
 		<PackageVersion Include="NUnit" Version="3.13.2" />
 		<PackageVersion Include="FluentAssertions" Version="5.10.3" />
 
-		<PackageVersion Include="linq2db" Version="3.5.0" />
+		<PackageVersion Include="linq2db" Version="3.5.1" />
 		<PackageVersion Include="linq2db.Tools" Version="3.5.0" />
 
 		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
 
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-preview.6.21352.1" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-preview.6.21352.1" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
 
-		<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21352.12" />
-		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0-preview.6.21352.12" />
+		<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
 
-		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0-preview.5" />
-		<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-preview6" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.6.21352.1" />
-		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-preview.6.21352.1" />
+		<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0-preview.7" />
+		<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.2" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+		<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
 	</ItemGroup>
 </Project>
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="net6.0">
-				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="6.0.0-preview.6.21352.1" />
-				<dependency id="linq2db" version="3.5.0" />
+				<dependency id="Microsoft.EntityFrameworkCore.Relational" version="6.0.0" />
+				<dependency id="linq2db" version="3.5.1" />
 			</group>
 		</dependencies>
 	</metadata>
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/EFCoreExpressionAttribute.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/EFCoreExpressionAttribute.cs
@@ -8,7 +8,7 @@
 namespace LinqToDB.EntityFrameworkCore.Internal
 {
 	/// <summary>
-	/// Maps linq2db exression.
+	/// Maps linq2db expression.
 	/// </summary>
 	public class EFCoreExpressionAttribute : Sql.ExpressionAttribute
 	{
@@ -20,12 +20,13 @@ public EFCoreExpressionAttribute(string expression) : base(expression)
 		{
 		}
 
-		/// <inheritdoc cref="Sql.ExpressionAttribute.GetExpression(IDataContext, SelectQuery, System.Linq.Expressions.Expression, Func{Expression, ColumnDescriptor?, ISqlExpression})" />
-		public override ISqlExpression GetExpression(
+		/// <inheritdoc />
+		public override ISqlExpression? GetExpression<TContext>(
+			TContext context,
 			IDataContext dataContext,
 			SelectQuery query,
 			Expression expression,
-			Func<Expression, ColumnDescriptor?, ISqlExpression> converter)
+			Func<TContext, Expression, ColumnDescriptor?, ISqlExpression> converter)
 		{
 			var knownExpressions = new List<Expression>();
 			if (expression.NodeType == ExpressionType.Call)
@@ -41,20 +42,20 @@ public override ISqlExpression GetExpression(
 				knownExpressions.Add(me.Expression!);
 			}
 
-			var pams = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));
+			var parms = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));
 
-			_ = Sql.ExtensionAttribute.ResolveExpressionValues(Expression!,
-				(v, d) =>
+			_ = ResolveExpressionValues((context, parms, knownExpressions, converter), Expression!,
+				static (ctx, v, d) =>
 				{
 					var idx = int.Parse(v);
 
-					if (pams[idx] == null)
-						pams[idx] = converter(knownExpressions[idx], null);
+					if (ctx.parms[idx] == null)
+						ctx.parms[idx] = ctx.converter(ctx.context, ctx.knownExpressions[idx], null);
 
 					return v;
 				});
 
-			var parameters = pams.Select(p => p ?? new SqlExpression("!!!")).ToArray();
+			var parameters = parms.Select(p => p ?? new SqlExpression("!!!")).ToArray();
 			return new SqlExpression(expression.Type, Expression!, Precedence, parameters);
 		}
 	}
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs
@@ -1056,10 +1056,10 @@ static bool IsEnumerableType(Type type, MappingSchema mappingSchema)
 			if (queryContextFactoryField.GetValue(compiler) is not RelationalQueryContextFactory queryContextFactory)
 				throw new LinqToDBForEFToolsException("LinqToDB Tools for EFCore support only Relational Databases.");
 
-			var dependenciesProperty = typeof(RelationalQueryContextFactory).GetField("_dependencies", BindingFlags.NonPublic | BindingFlags.Instance);
+			var dependenciesProperty = typeof(RelationalQueryContextFactory).GetProperty("Dependencies", BindingFlags.NonPublic | BindingFlags.Instance);
 
 			if (dependenciesProperty == null)
-				throw new LinqToDBForEFToolsException($"Can not find private property '{nameof(RelationalQueryContextFactory)}._dependencies' in current EFCore Version.");
+				throw new LinqToDBForEFToolsException($"Can not find protected property '{nameof(RelationalQueryContextFactory)}._dependencies' in current EFCore Version.");
 
 			var dependencies = (QueryContextDependencies) dependenciesProperty.GetValue(queryContextFactory)!;
 
diff --git a/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/Inheritance/InheritanceContext.cs b/Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/Models/Inheritance/InheritanceContext.cs
@@ -55,7 +55,7 @@ private void VersionEntity()
 
 			foreach (var modifiedEntry in modifiedEntries)
 			{
-				var cloned = (IVersionable)Activator.CreateInstance(modifiedEntry.Entity.GetType());
+				var cloned = (IVersionable)Activator.CreateInstance(modifiedEntry.Entity.GetType())!;
 				modifiedEntry.CurrentValues.SetValues(cloned);
 
 				// rollback

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace LinqToDB.EntityFrameworkCore.Internal`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`		`- /// Maps linq2db exression.`
	`11`	`+ /// Maps linq2db expression.`
`12`	`12`	`/// </summary>`
`13`	`13`	`public class EFCoreExpressionAttribute : Sql.ExpressionAttribute`
`14`	`14`	`{`
`@@ -20,12 +20,13 @@ public EFCoreExpressionAttribute(string expression) : base(expression)`
`20`	`20`	`{`
`21`	`21`	`}`
`22`	`22`
`23`		`- /// <inheritdoc cref="Sql.ExpressionAttribute.GetExpression(IDataContext, SelectQuery, System.Linq.Expressions.Expression, Func{Expression, ColumnDescriptor?, ISqlExpression})" />`
`24`		`- public override ISqlExpression GetExpression(`
	`23`	`+ /// <inheritdoc />`
	`24`	`+ public override ISqlExpression? GetExpression<TContext>(`
	`25`	`+ TContext context,`
`25`	`26`	`IDataContext dataContext,`
`26`	`27`	`SelectQuery query,`
`27`	`28`	`Expression expression,`
`28`		`- Func<Expression, ColumnDescriptor?, ISqlExpression> converter)`
	`29`	`+ Func<TContext, Expression, ColumnDescriptor?, ISqlExpression> converter)`
`29`	`30`	`{`
`30`	`31`	`var knownExpressions = new List<Expression>();`
`31`	`32`	`if (expression.NodeType == ExpressionType.Call)`
`@@ -41,20 +42,20 @@ public override ISqlExpression GetExpression(`
`41`	`42`	`knownExpressions.Add(me.Expression!);`
`42`	`43`	`}`
`43`	`44`
`44`		`- var pams = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));`
	`45`	`+ var parms = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));`
`45`	`46`
`46`		`- _ = Sql.ExtensionAttribute.ResolveExpressionValues(Expression!,`
`47`		`- (v, d) =>`
	`47`	`+ _ = ResolveExpressionValues((context, parms, knownExpressions, converter), Expression!,`
	`48`	`+ static (ctx, v, d) =>`
`48`	`49`	`{`
`49`	`50`	`var idx = int.Parse(v);`
`50`	`51`
`51`		`- if (pams[idx] == null)`
`52`		`- pams[idx] = converter(knownExpressions[idx], null);`
	`52`	`+ if (ctx.parms[idx] == null)`
	`53`	`+ ctx.parms[idx] = ctx.converter(ctx.context, ctx.knownExpressions[idx], null);`
`53`	`54`
`54`	`55`	`return v;`
`55`	`56`	`});`
`56`	`57`
`57`		`- var parameters = pams.Select(p => p ?? new SqlExpression("!!!")).ToArray();`
	`58`	`+ var parameters = parms.Select(p => p ?? new SqlExpression("!!!")).ToArray();`
`58`	`59`	`return new SqlExpression(expression.Type, Expression!, Precedence, parameters);`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private void VersionEntity()`
`55`	`55`
`56`	`56`	`foreach (var modifiedEntry in modifiedEntries)`
`57`	`57`	`{`
`58`		`- var cloned = (IVersionable)Activator.CreateInstance(modifiedEntry.Entity.GetType());`
	`58`	`+ var cloned = (IVersionable)Activator.CreateInstance(modifiedEntry.Entity.GetType())!;`
`59`	`59`	`modifiedEntry.CurrentValues.SetValues(cloned);`
`60`	`60`
`61`	`61`	`// rollback`